Skip to content

Commit 4a22a2c

Browse files
committed
Add dashboard IP binding settings
1 parent 2bfc41a commit 4a22a2c

4 files changed

Lines changed: 34 additions & 6 deletions

File tree

windroseconfig.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,34 @@
208208
"Special": "array:text",
209209
"EnumValues": {}
210210
},
211+
{
212+
"DisplayName": "Dashboard IP Binding Selection Mode",
213+
"Category": "Windrose:stadia_controller",
214+
"Subcategory": "WindrosePlus:extension:2",
215+
"Description": "Sets whether the IP binding of the Windrose+ dashboard should be automatically set, or whether it should be set to the instance's Application IP Binding or the IP set under Dashboard IP Binding. Note that on Windows the forced binding is 'localhost' only unless the Network Service user has appropriate ACL permissions",
216+
"Keywords": "ip,binding,dashboard",
217+
"FieldName": "HTTPBinding",
218+
"InputType": "enum",
219+
"ParamFieldName": "HTTPBinding",
220+
"DefaultValue": "",
221+
"EnumValues": {
222+
"": "Automatic (default)",
223+
"{{$ApplicationIPBinding}}": "Application IP Binding",
224+
"{{ManualIPBinding}}": "Manual"
225+
}
226+
},
227+
{
228+
"DisplayName": "Dashboard IP Binding",
229+
"Category": "Windrose:stadia_controller",
230+
"Subcategory": "WindrosePlus:extension:2",
231+
"Description": "Sets the IP binding for the Windrose+ dashboard, if 'Manual' is selected as the Dashboard IP Binding Selection Mode",
232+
"Keywords": "manual,ip,binding,dashboard",
233+
"FieldName": "ManualIPBinding",
234+
"InputType": "text",
235+
"ParamFieldName": "ManualIPBinding",
236+
"DefaultValue": "",
237+
"EnumValues": {}
238+
},
211239
{
212240
"DisplayName": "Unlock All Ships",
213241
"Category": "Windrose:stadia_controller",

windroserundashboard.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ if (-not $serverStarted) { exit 0 }
1616

1717
# Start the Windrose+ dashboard
1818
$dashboardJob = Start-Job -ScriptBlock {
19-
param($scriptRoot, $port)
20-
& powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$scriptRoot\windrose\4129620\windrose_plus\server\windrose_plus_server.ps1" -Port $port -GameDir "$scriptRoot\windrose\4129620"
21-
} -ArgumentList $PSScriptRoot, $args[0]
19+
param($scriptRoot, $port, $bindIp)
20+
& powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$scriptRoot\windrose\4129620\windrose_plus\server\windrose_plus_server.ps1" -Port $port $(if ($bindIp) { "-BindIp", $bindIp }) -GameDir "$scriptRoot\windrose\4129620"
21+
} -ArgumentList $PSScriptRoot, $args[0], $args[1]
2222

2323
# Exit if dashboard fails to start
2424
Start-Sleep -Seconds 10

windroserundashboard.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fi
2323

2424
# Start the Windrose+ dashboard
2525
cd ./windrose/4129620
26-
powershell/pwsh -NoProfile -File "$scriptDir/windrose/4129620/windrose_plus/server/windrose_plus_server.ps1" -Port $1 -GameDir "$scriptDir/windrose/4129620" &
26+
powershell/pwsh -NoProfile -File "$scriptDir/windrose/4129620/windrose_plus/server/windrose_plus_server.ps1" -Port $1 ${2:+-BindIp "$2"} -GameDir "$scriptDir/windrose/4129620" &
2727
dashboardPid=$!
2828

2929
# Exit if dashboard fails to start

windrosestart.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"UpdateSourcePlatform": "Windows",
4949
"UpdateSource": "Executable",
5050
"UpdateSourceData": "powershell.exe",
51-
"UpdateSourceArgs": "-NoProfile -ExecutionPolicy Bypass -File ./rundashboard.ps1 {{$HTTPPort}}",
51+
"UpdateSourceArgs": "-NoProfile -ExecutionPolicy Bypass -File ./rundashboard.ps1 {{$HTTPPort}} {{HTTPBinding}}",
5252
"UpdateSourceConditionSetting": "InstallWindrosePlus",
5353
"UpdateSourceConditionValue": "true",
5454
"RunInBackground": true,
@@ -59,7 +59,7 @@
5959
"UpdateSourcePlatform": "Linux",
6060
"UpdateSource": "Executable",
6161
"UpdateSourceData": "/bin/bash",
62-
"UpdateSourceArgs": "-c \"chmod +x rundashboard.sh; ./rundashboard.sh {{$HTTPPort}} &\"",
62+
"UpdateSourceArgs": "-c \"chmod +x rundashboard.sh; ./rundashboard.sh {{$HTTPPort}} {{HTTPBinding}} &\"",
6363
"UpdateSourceConditionSetting": "InstallWindrosePlus",
6464
"UpdateSourceConditionValue": "true",
6565
"RunInBackground": true,

0 commit comments

Comments
 (0)