Various: add public IP selector setting

arma-reforger.kvp

@@ -9,7 +9,7 @@ Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.Ports.$QueryPort}
 Meta.ConfigManifest=arma-reforgerconfig.json
 Meta.MetaConfigManifest=arma-reforgermetaconfig.json
 Meta.ConfigRoot=arma-reforger.kvp
-Meta.MinAMPVersion=2.4.2.0
+Meta.MinAMPVersion=2.6.2.6
 Meta.SpecificDockerImage=cubecoders/ampbase
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
@@ -19,7 +19,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=9
+Meta.ConfigVersion=10
 Meta.AppConfigId=23e04f07-dab1-4741-a6e9-e9d0d292c8f1
 Meta.AppIsMultiIPAware=True
 App.DisplayName=Arma Reforger

arma-reforgerconfig.json

@@ -83,20 +83,6 @@
         "IncludeInCommandLine": false,
         "EnumValues": {}
     },
-    {
-        "DisplayName": "Public IP Binding",
-        "Category": "Arma Reforger:stadia_controller",
-        "Subcategory": "Server:dns:1",
-        "Description": "",
-        "Keywords": "",
-        "FieldName": "$ExternalIP",
-        "InputType": "text",
-        "IsFlagArgument": false,
-        "Hidden": true,
-        "ParamFieldName": "publicAddress",
-        "IncludeInCommandLine": false,
-        "EnumValues": {}
-    },
     {
         "DisplayName": "RCON Permission",
         "Category": "Arma Reforger:stadia_controller",
@@ -206,6 +192,33 @@
             "True": "true"
         }
     },
+    {
+        "DisplayName": "Public IP Selection Mode",
+        "Category": "Arma Reforger:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets whether AMP should automatically select the public IP advertised for the server, or whether it should use the IP set under Server Public IP",
+        "Keywords": "public,ip,address,publicAddress",
+        "FieldName": "publicAddress",
+        "InputType": "enum",
+        "ParamFieldName": "publicAddress",
+        "DefaultValue": "{{$ExternalIP}}",
+        "EnumValues": {
+            "{{$ExternalIP}}": "Automatic (default)",
+            "{{ManualPublicIP}}": "Manual"
+        }
+    },
+    {
+        "DisplayName": "Server Public IP",
+        "Category": "Arma Reforger:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets the public IP advertised for the server, if \"Manual\" is selected as the Public IP Selection Mode. Useful if the host network has multiple public IPs, or the server is behind a public proxy",
+        "Keywords": "manual,public,ip,publicAddress",
+        "FieldName": "ManualPublicIP",
+        "InputType": "text",
+        "ParamFieldName": "ManualPublicIP",
+        "DefaultValue": "",
+        "EnumValues": {}
+    },
     {
         "DisplayName": "Enable Crossplay",
         "Category": "Arma Reforger:stadia_controller",

astroneer.kvp

@@ -10,7 +10,7 @@ Meta.EndpointURIFormat=steam://connect/{0}
 Meta.ConfigManifest=astroneerconfig.json
 Meta.MetaConfigManifest=astroneermetaconfig.json
 Meta.ConfigRoot=astroneer.kvp
-Meta.MinAMPVersion=2.5.0.4
+Meta.MinAMPVersion=2.6.2.6
 Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.DockerBaseReadOnly=False
@@ -21,7 +21,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=4
+Meta.ConfigVersion=5
 Meta.ReleaseNotes=
 Meta.BreakingReleaseNotes=
 Meta.AppConfigId=2a9f3285-5adc-4574-8a5b-d6ef39e8b7a0

astroneerconfig.json

@@ -14,21 +14,6 @@
         "IncludeInCommandLine": false,
         "EnumValues": {}
     },
-    {
-        "DisplayName": "Public IP",
-        "Category": "Astroneer:stadia_controller",
-        "Subcategory": "Server:dns:1",
-        "Description": "",
-        "Keywords": "",
-        "FieldName": "$ExternalIP",
-        "InputType": "text",
-        "Hidden": true,
-        "IsFlagArgument": false,
-        "ParamFieldName": "/Script/Astro.AstroServerSettings.PublicIP",
-        "ExcludeFromImport": true,
-        "IncludeInCommandLine": false,
-        "EnumValues": {}
-    },
     {
         "DisplayName": "Server Port",
         "Category": "Astroneer:stadia_controller",
@@ -227,6 +212,33 @@
         "Suffix": "fps",
         "EnumValues": {}
     },
+    {
+        "DisplayName": "Public IP Selection Mode",
+        "Category": "Astroneer:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets whether AMP should automatically select the public IP advertised for the server, or whether it should use the IP set under Server Public IP",
+        "Keywords": "public,ip,publicip",
+        "FieldName": "PublicIP",
+        "InputType": "enum",
+        "ParamFieldName": "/Script/Astro.AstroServerSettings.PublicIP",
+        "DefaultValue": "{{$ExternalIP}}",
+        "EnumValues": {
+            "{{$ExternalIP}}": "Automatic (default)",
+            "{{ManualPublicIP}}": "Manual"
+        }
+    },
+    {
+        "DisplayName": "Server Public IP",
+        "Category": "Astroneer:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets the public IP advertised for the server, if \"Manual\" is selected as the Public IP Selection Mode. Useful if the host network has multiple public IPs, or the server is behind a public proxy",
+        "Keywords": "manual,public,ip,publicip",
+        "FieldName": "ManualPublicIP",
+        "InputType": "text",
+        "ParamFieldName": "ManualPublicIP",
+        "DefaultValue": "",
+        "EnumValues": {}
+    },
     {
         "DisplayName": "Proton GE Release Version (Linux)",
         "Category": "Updates",

impostor.kvp

@@ -10,7 +10,7 @@ Meta.EndpointURIFormat=
 Meta.ConfigManifest=impostorconfig.json
 Meta.MetaConfigManifest=impostormetaconfig.json
 Meta.ConfigRoot=impostor.kvp
-Meta.MinAMPVersion=2.4.0.10
+Meta.MinAMPVersion=2.6.2.6
 Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
@@ -19,7 +19,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=5
+Meta.ConfigVersion=6
 Meta.ReleaseNotes=
 Meta.BreakingReleaseNotes=
 Meta.ImportableExtensions=[]

impostorconfig.json

@@ -1,18 +1,4 @@
 [
-    {
-        "DisplayName": "Public IP",
-        "Category": "Impostor:stadia_controller",
-        "Subcategory": "Server:dns:1",
-        "Description": "",
-        "Keywords": "",
-        "FieldName": "$ExternalIP",
-        "InputType": "text",
-        "IsFlagArgument": false,
-        "Hidden": true,
-        "ParamFieldName": "$.Server.PublicIp",
-        "IncludeInCommandLine": false,
-        "EnumValues": {}
-    },
     {
         "DisplayName": "Public Port",
         "Category": "Impostor:stadia_controller",
@@ -258,5 +244,32 @@
             "False": "false",
             "True": "true"
         }
+    },
+    {
+        "DisplayName": "Public IP Selection Mode",
+        "Category": "Impostor:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets whether AMP should automatically select the public IP advertised for the server, or whether it should use the IP set under Server Public IP",
+        "Keywords": "public,ip,publicip",
+        "FieldName": "PublicIp",
+        "InputType": "enum",
+        "ParamFieldName": "$.Server.PublicIp",
+        "DefaultValue": "{{$ExternalIP}}",
+        "EnumValues": {
+            "{{$ExternalIP}}": "Automatic (default)",
+            "{{ManualPublicIP}}": "Manual"
+        }
+    },
+    {
+        "DisplayName": "Server Public IP",
+        "Category": "Impostor:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets the public IP advertised for the server, if \"Manual\" is selected as the Public IP Selection Mode. Useful if the host network has multiple public IPs, or the server is behind a public proxy",
+        "Keywords": "manual,public,ip,publicip",
+        "FieldName": "ManualPublicIP",
+        "InputType": "text",
+        "ParamFieldName": "ManualPublicIP",
+        "DefaultValue": "",
+        "EnumValues": {}
     }
 ]

openrct2.kvp

@@ -10,7 +10,7 @@ Meta.EndpointURIFormat=
 Meta.ConfigManifest=openrct2config.json
 Meta.MetaConfigManifest=openrct2metaconfig.json
 Meta.ConfigRoot=openrct2.kvp
-Meta.MinAMPVersion=2.4.6.2
+Meta.MinAMPVersion=2.6.2.6
 Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.DockerBaseReadOnly=False
@@ -21,7 +21,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=4
+Meta.ConfigVersion=5
 Meta.ReleaseNotes=
 Meta.BreakingReleaseNotes=
 Meta.AppConfigId=9ac30173-aff1-438a-ba5c-29bd09e0c7dd

openrct2config.json

@@ -37,18 +37,6 @@
         "DefaultValue": "Server",
         "EnumValues": {}
     },
-    {
-        "DisplayName": "Advertise Address",
-        "Category": "OpenRCT2:stadia_controller",
-        "Subcategory": "Server:dns:1",
-        "Description": "",
-        "Keywords": "",
-        "FieldName": "$ExternalIP",
-        "InputType": "text",
-        "Hidden": true,
-        "ParamFieldName": "network.advertise_address",
-        "EnumValues": {}
-    },
     {
         "DisplayName": "Host Mode",
         "Category": "OpenRCT2:stadia_controller",
@@ -313,6 +301,33 @@
             "True": "true"
         }
     },
+    {
+        "DisplayName": "Advertise Address Selection Mode",
+        "Category": "OpenRCT2:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets whether AMP should automatically select the public IP advertised for the server, or whether it should use the IP set under Server Public IP",
+        "Keywords": "public,ip,advertise,advertise_address",
+        "FieldName": "advertise_address",
+        "InputType": "enum",
+        "ParamFieldName": "network.advertise_address",
+        "DefaultValue": "{{$ExternalIP}}",
+        "EnumValues": {
+            "{{$ExternalIP}}": "Automatic (default)",
+            "{{ManualPublicIP}}": "Manual"
+        }
+    },
+    {
+        "DisplayName": "Server Public IP",
+        "Category": "OpenRCT2:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets the public IP advertised for the server, if \"Manual\" is selected as the Advertise Address Selection Mode. Useful if the host network has multiple public IPs, or the server is behind a public proxy",
+        "Keywords": "manual,public,ip,advertise,advertise_address",
+        "FieldName": "ManualPublicIP",
+        "InputType": "text",
+        "ParamFieldName": "ManualPublicIP",
+        "DefaultValue": "",
+        "EnumValues": {}
+    },
     {
         "DisplayName": "Master Server URL",
         "Category": "OpenRCT2:stadia_controller",

scp-secret-laboratory.kvp

@@ -10,7 +10,7 @@ Meta.EndpointURIFormat=
 Meta.ConfigManifest=scp-secret-laboratoryconfig.json
 Meta.MetaConfigManifest=scp-secret-laboratorymetaconfig.json
 Meta.ConfigRoot=scp-secret-laboratory.kvp
-Meta.MinAMPVersion=2.4.6.2
+Meta.MinAMPVersion=2.6.2.6
 Meta.SpecificDockerImage=cubecoders/ampbase:mono
 Meta.DockerRequired=False
 Meta.DockerBaseReadOnly=False
@@ -21,7 +21,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=7
+Meta.ConfigVersion=8
 Meta.ReleaseNotes=
 Meta.BreakingReleaseNotes=
 Meta.AppConfigId=d26e2770-d31f-4cb6-8ca5-c5031c091fe4

scp-secret-laboratoryconfig.json

@@ -1,16 +1,4 @@
 [
-    {
-        "DisplayName": "Server Public IP",
-        "Category": "SCP SL:stadia_controller",
-        "Subcategory": "Server:dns:1",
-        "Description": "",
-        "Keywords": "",
-        "FieldName": "$ExternalIP",
-        "InputType": "text",
-        "Hidden": true,
-        "ParamFieldName": "server_ip",
-        "EnumValues": {}
-    },
     {
         "DisplayName": "Query Port Shift",
         "Category": "SCP SL:stadia_controller",
@@ -331,6 +319,33 @@
         "Placeholder": "::",
         "EnumValues": {}
     },
+    {
+        "DisplayName": "Public IP Selection Mode",
+        "Category": "SCP SL:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets whether AMP should automatically select the public IP advertised for the server, or whether it should use the IP set under Server Public IP",
+        "Keywords": "public,server,ip,server_ip",
+        "FieldName": "server_ip",
+        "InputType": "enum",
+        "ParamFieldName": "server_ip",
+        "DefaultValue": "{{$ExternalIP}}",
+        "EnumValues": {
+            "{{$ExternalIP}}": "Automatic (default)",
+            "{{ManualPublicIP}}": "Manual"
+        }
+    },
+    {
+        "DisplayName": "Server Public IP",
+        "Category": "SCP SL:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "Sets the public IP advertised for the server, if \"Manual\" is selected as the Public IP Selection Mode. Useful if the host network has multiple public IPs, or the server is behind a public proxy",
+        "Keywords": "manual,public,server,ip,server_ip",
+        "FieldName": "ManualPublicIP",
+        "InputType": "text",
+        "ParamFieldName": "ManualPublicIP",
+        "DefaultValue": "",
+        "EnumValues": {}
+    },
     {
         "DisplayName": "Server Plugins",
         "Category": "SCP SL:stadia_controller",