Various updates

- Use OS_CLOSE for saner shutdown (on Linux at least) - Add start/wait/stop update stages - Shorten exit timeout (for Windows) - Other tweaks (RCON port, command line args, manifest)
2022-02-02 00:21:14 +11:00
parent 6cf4aac008
commit aa35ddfc16
3 changed files with 17 additions and 17 deletions
--- a/unturned.kvp
+++ b/unturned.kvp
@@ -19,13 +19,13 @@ App.ExecutableLinux=1110390/Unturned_Headless.x86_64
 App.WorkingDir=1110390
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{$PlatformArgs}} -batchmode -nographics +{{ServerType}}/{{ServerName}} {{$FormattedArgs}}
+App.CommandLineArgs={{$PlatformArgs}} -batchmode -nographics {{$FormattedArgs}} +{{ServerType}}/{{ServerName}}
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%:./Unturned_Headless_Data/Plugins/x86_64/","SteamAppId":"304930"}
-App.CommandLineParameterFormat=-{0}/{1}
+App.CommandLineParameterFormat=-{0}={1}
 App.CommandLineParameterDelimiter= 
-App.ExitMethod=String
-App.ExitTimeout=30
+App.ExitMethod=OS_CLOSE
+App.ExitTimeout=10
 App.ExitString=shutdown
 App.ExitFile=app_exit.lck
 App.HasWriteableConsole=True
@@ -36,14 +36,14 @@ App.ApplicationIPBinding=0.0.0.0
 App.ApplicationPort1=27015
 App.ApplicationPort2=27016
 App.ApplicationPort3=0
-App.RemoteAdminPort=27017
+App.RemoteAdminPort=27115
 App.MaxUsers=10
 App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
 App.AdminMethod=TelnetRCON
 App.RCONConnectDelaySeconds=5
 App.RCONConnectRetrySeconds=5
-App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1110390"},{"UpdateStageName":"Main Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedconfigfile.dat","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Workshop Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedworkshopconfig.json","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Servers/{{ServerName}}/Server"},{"UpdateStageName":"Config File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Servers/{{ServerName}}/Server/Commands.dat","UpdateSourceArgs":"./unturnedconfigfile.dat","OverwriteExistingFiles":false},{"UpdateStageName":"Rocket Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Modules/Rocket.Unturned"},{"UpdateStageName":"First Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/English.dat","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/English.dat","OverwriteExistingFiles":true},{"UpdateStageName":"Second Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.API.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.API.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Third Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Core.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Core.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fourth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fifth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.module","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.module","OverwriteExistingFiles":true},{"UpdateStageName":"Steam Directory Creation","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64"},{"UpdateStageName":"Steamclient Copy","UpdateSourcePlatform":"Linux","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64/steamclient.so","UpdateSourceArgs":"./U3DS/1110390/linux64/steamclient.so","OverwriteExistingFiles":true}]
+App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1110390"},{"UpdateStageName":"Main Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedconfigfile.dat","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Workshop Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/unturnedworkshopconfig.json","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Servers/{{ServerName}}/Server"},{"UpdateStageName":"Config File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Servers/{{ServerName}}/Server/Commands.dat","UpdateSourceArgs":"./unturnedconfigfile.dat","OverwriteExistingFiles":false},{"UpdateStageName":"Rocket Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Modules/Rocket.Unturned"},{"UpdateStageName":"First Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/English.dat","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/English.dat","OverwriteExistingFiles":true},{"UpdateStageName":"Second Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.API.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.API.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Third Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Core.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Core.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fourth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.dll","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.dll","OverwriteExistingFiles":true},{"UpdateStageName":"Fifth Rocket File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Modules/Rocket.Unturned/Rocket.Unturned.module","UpdateSourceArgs":"./U3DS/1110390/Extras/Rocket.Unturned/Rocket.Unturned.module","OverwriteExistingFiles":true},{"UpdateStageName":"Steam Directory Creation","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64"},{"UpdateStageName":"Steamclient Copy","UpdateSourcePlatform":"Linux","UpdateSource":"CopyFilePath","UpdateSourceData":"./U3DS/1110390/Unturned_Headless_Data/Plugins/x86_64/steamclient.so","UpdateSourceArgs":"./U3DS/1110390/linux64/steamclient.so","OverwriteExistingFiles":true},{"UpdateStageName":"Start Server","UpdateSourcePlatform":"All","UpdateSource":"StartApplication"},{"UpdateStageName":"Wait For Server Start","UpdateSourcePlatform":"All","UpdateSource":"WaitForStartupComplete"},{"UpdateStageName":"Stop Server","UpdateSourcePlatform":"All","UpdateSource":"ShutdownApplication"}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False
--- a/unturnedconfig.json
+++ b/unturnedconfig.json
@@ -36,12 +36,12 @@
        "Hidden": true,
        "ParamFieldName": "/RocketSettings/RCON/@Port",
        "IncludeInCommandLine": false,
-        "DefaultValue": "27017"
+        "DefaultValue": "27115"
    },
    {
        "DisplayName": "Server Name",
        "Category": "Server Settings",
-        "Description": "WARNING: You MUST do first-time server setup (update the server and start and stop it once) after changing the name for correct configuration",
+        "Description": "WARNING: You MUST run an update of the server after changing the name for correct configuration",
        "Keywords": "name",
        "FieldName": "ServerName",
        "InputType": "text",
@@ -69,14 +69,14 @@
    {
        "DisplayName": "Server Password",
        "Category": "Server Settings",
-        "Description": "Password to connect to the server. Change this after installing the server",
+        "Description": "Password to connect to the server. Default is no password",
        "Keywords": "password",
        "FieldName": "Password",
        "InputType": "RandomPassword",
        "IsFlagArgument": false,
        "ParamFieldName": "Password",
        "IncludeInCommandLine": false,
-        "DefaultValue": "Password123"
+        "DefaultValue": ""
    },
    {
        "DisplayName": "RCON Password",
@@ -137,7 +137,7 @@
        "ParamFieldName": "Maxplayers",
        "IncludeInCommandLine": false,
        "DefaultValue": "10",
-        "suffix": "players"
+        "Suffix": "players"
    },
    {
        "DisplayName": "Map",
@@ -214,7 +214,7 @@
        "ParamFieldName": "Cycle",
        "IncludeInCommandLine": false,
        "DefaultValue": "3600",
-        "suffix": "seconds"
+        "Suffix": "seconds"
    },
    {
        "DisplayName": "Chat Rate",
@@ -227,7 +227,7 @@
        "ParamFieldName": "Chatrate",
        "IncludeInCommandLine": false,
        "DefaultValue": "0",
-        "suffix": "seconds"
+        "Suffix": "seconds"
    },
    {
        "DisplayName": "Timeout",
@@ -240,7 +240,7 @@
        "ParamFieldName": "Timeout",
        "IncludeInCommandLine": false,
        "DefaultValue": "500",
-        "suffix": "milliseconds"
+        "Suffix": "milliseconds"
    },
    {
        "DisplayName":"Workshop Items",
@@ -253,7 +253,7 @@
        "ParamFieldName":"FileIDs",
        "IncludeInCommandLine":false,
        "DefaultValue":"",
-        "placeholder":"2478247379,2566953935"
+        "Placeholder":"2478247379,2566953935"
    },
    {
        "DisplayName":"Excluded Workshop Items",
@@ -266,7 +266,7 @@
        "ParamFieldName":"ChildrenFileIDs",
        "IncludeInCommandLine":false,
        "DefaultValue":"",
-        "placeholder":"5685656858,7697679654"
+        "Placeholder":"5685656858,7697679654"
    },
    {
        "DisplayName": "Maximum Workshop Retries",
--- a/unturnedconfigfile.dat
+++ b/unturnedconfigfile.dat
@@ -1,5 +1,5 @@
 Port 27015
-Password Password123
+Password 
 Owner 
 GSLT 
 Welcome Welcome to Unturned. Hosted using AMP by CubeCoders