Merge branch 'master' into dependabot/github_actions/dessant/lock-thr…

…eads-5

lgsm/config-default/config-lgsm/arkserver/_default.cfg

@@ -12,14 +12,13 @@
 ip="0.0.0.0"
 port="7777"
 queryport="27015"
-rconport="27020"
 # Default Map: TheIsland, Ragnarok, CrystalIsles, Aberration_P, ScorchedEarth_P, TheCenter, Extinction, Valguero_P, Genesis, Gen2
 defaultmap="TheIsland"
 altsavedirectoryname="${defaultmap}"
-maxplayers="70"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${publicip}"
+## Game Server Docs | https://ark.wiki.gg/wiki/Server_configuration
+startparameters="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname} -MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -AutoManagedMods -Crossplay -PublicIPForEpic=${publicip}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/arma3server/_default.cfg

@@ -32,7 +32,7 @@ servermods=""
 bepath=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod='${mods}' -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
+startparameters="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/btlserver/_default.cfg

@@ -14,7 +14,7 @@ port="7777"
 queryport="7780"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="/Game/Maps/Final_Maps/Derailed?Game=/Script/ShooterGame.WartideGameMode?listen -log -broadcastip=\"${publicip}\" -PORT=${port} -QueryPort=${queryport} -defgameini=\"${servercfgfullpath}\""
+startparameters="-Port=${port} -QueryPort=${queryport} -BroadcastIp=${publicip} -log"
 
 #### LinuxGSM Settings ####
 
@@ -157,8 +157,8 @@ systemdir="${serverfiles}/Battalion"
 executabledir="${systemdir}/Binaries/Linux"
 executable="./BattalionServer-Linux-Shipping"
 servercfgdir="${systemdir}/Saved/Config/LinuxServer"
-servercfg="${selfname}.ini"
-servercfgdefault="DefaultGame.ini"
+servercfg="Game.ini"
+servercfgdefault="Game.ini"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory

lgsm/config-default/config-lgsm/cod2server/_default.cfg

@@ -15,7 +15,7 @@ defaultmap="mp_leningrad"
 maxplayers="20"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/cod4server/_default.cfg

@@ -15,7 +15,7 @@ defaultmap="mp_crossfire"
 maxplayers="32"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set fs_homepath ${serverfiles} +set sv_authorizemode "-1" +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set fs_homepath ${serverfiles} +set sv_authorizemode "-1" +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/codserver/_default.cfg

@@ -15,7 +15,7 @@ defaultmap="mp_neuville"
 maxplayers="20"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/coduoserver/_default.cfg

@@ -15,7 +15,7 @@ defaultmap="mp_cassino"
 maxplayers="20"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/codwawserver/_default.cfg

@@ -15,7 +15,7 @@ defaultmap="mp_castle"
 maxplayers="20"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxplayers} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/colserver/_default.cfg

@@ -136,7 +136,7 @@ querymode="2"
 querytype="protocol-valve"
 
 ## Console type
-consoleverbose="no"
+consoleverbose="yes"
 consoleinteract="no"
 
 ## Game Server Details

lgsm/config-default/config-lgsm/ctserver/_default.cfg

@@ -135,7 +135,7 @@ querymode="1"
 querytype=""
 
 ## Console type
-consoleverbose="no"
+consoleverbose="yes"
 consoleinteract="yes"
 
 ## Game Server Details

lgsm/config-default/config-lgsm/dayzserver/_default.cfg

@@ -128,7 +128,7 @@ steamcmdforcewindows="no"
 branch=""
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="false"
+steammaster="true"
 
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill

lgsm/config-default/config-lgsm/gmodserver/_default.cfg

@@ -19,8 +19,6 @@ tickrate="66"
 gamemode="sandbox"
 
 ## Workshop Parameters | https://wiki.facepunch.com/gmod/Workshop_for_Dedicated_Servers
-# To get an API key visit - https://steamcommunity.com/dev/apikey
-wsapikey=""
 wscollectionid=""
 
 ## Game Server Login Token (GSLT): Optional
@@ -29,7 +27,7 @@ wscollectionid=""
 gslt=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${wscollectionid} -authkey ${wsapikey} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -disableluarefresh"
+startparameters="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${wscollectionid} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -disableluarefresh"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/hcuserver/_default.cfg

@@ -17,7 +17,7 @@ queryport="27015"
 servername="LinuxGSM"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${defaultmap}?Difficulty=1?Game=DM?MapList=KidsBedroom,Playground,Garden,Hallway_Simple,Bathroom,Hallway_Hard,Attic_Daytime,Shed,ToyPalace,Kitchen,Garage?MaxPlayers=${maxplayers}?WeaponTypes=7?TimeLimit=600?ScoreLimit=30?Teamplay -ServerName='${servername}' -Port=${port} -QueryPort=${queryport} -NOCONSOLE -unattended"
+startparameters="${defaultmap}?MaxPlayers=${maxplayers} -ServerName='${servername}' -Port=${port} -QueryPort=${queryport}"
 
 ## Server Parameters for Plague mode
 #startparameters="${defaultmap}?Game=PL?MapList=KidsBedroom,Garden,Hallway_Simple,Attic_Daytime,Garage,Shed,Kitchen,Hallway_Hard,ToyPalace,Bathroom?MaxPlayers=${maxplayers}?WeaponTypes=7?TimeLimit=600 -ServerName='${servername}' -Port=${port} -QueryPort=${queryport} -NOCONSOLE -unattended"
@@ -150,7 +150,7 @@ querymode="1"
 querytype=""
 
 ## Console type
-consoleverbose="no"
+consoleverbose="yes"
 consoleinteract="no"
 
 ## Game Server Details

lgsm/config-default/config-lgsm/inssserver/_default.cfg

@@ -13,10 +13,10 @@ ip="0.0.0.0"
 port="27102"
 queryport="27131"
 rconport="27015"
-rconpassword=""
+rconpassword="CHANGE_ME"
 servername="LinuxGSM"
-defaultmap="Canyon"
-defaultscenario="Scenario_Crossing_Push_Security"
+defaultmap="Oilfield"
+defaultscenario="Scenario_Refinery_Push_Security"
 maxplayers="28"
 
 ## Game Server Login Token (GSLT): Optional
@@ -25,7 +25,7 @@ maxplayers="28"
 gslt=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-## Parameter Docs | https://mod.io/g/insurgencysandstorm/r/server-admin-guide
+## Game Server Docs | https://mod.io/g/insurgencysandstorm/r/server-admin-guide
 startparameters="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers} -Port=${port} -QueryPort=${queryport} -hostname='${servername}' -Rcon -RconPassword=${rconpassword} -RconListenPort=${rconport} -GSLTToken=${gslt} -log"
 
 #### LinuxGSM Settings ####

lgsm/config-default/config-lgsm/jk2server/_default.cfg

@@ -18,7 +18,7 @@ port="27960"
 defaultmap="ffa_bespin"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set net_ip ${ip} +set net_port ${port} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/kfserver/_default.cfg

@@ -121,7 +121,7 @@ steamcmdforcewindows="no"
 branch=""
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="false"
+steammaster="true"
 
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill

lgsm/config-default/config-lgsm/mhserver/_default.cfg

@@ -17,7 +17,8 @@ queryport="27015"
 defaultmap="FFA_ThePit"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="Mordhau ${defaultmap} -log -MultiHome=${ip} -Port=${port} -BeaconPort=${beaconport} -QueryPort=${queryport} -GameIni=${servercfgfullpath}"
+## Game Server Docs | https://mordhau.fandom.com/wiki/Dedicated_Server_Hosting_Guide
+startparameters="Mordhau ${defaultmap} -MultiHome=${ip} -Port=${port} -BeaconPort=${beaconport} -QueryPort=${queryport} -GameIni=${servercfgfullpath} -log"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/mohaaserver/_default.cfg

@@ -14,7 +14,7 @@ port="12203"
 defaultmap="dm/mohdm1"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set fs_outputpath ${gamelogdir} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set fs_outputpath ${gamelogdir} +set dedicated 2 +set net_ip ${ip} +set net_port ${port} +map ${defaultmap} +exec ${servercfg} "
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/momserver/_default.cfg

@@ -14,7 +14,8 @@ port="7777"
 beaconport="15000"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-port="${port}" -beaconport="${beaconport}" -MULTIHOME="${ip}""
+## Game Server Docs | https://memoriesofmars.fandom.com/wiki/Dedicated_Servers
+startparameters="-MultiHome=${ip} -Port=${port} -BeaconPort=${beaconport} -log"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/ns2cserver/_default.cfg

@@ -15,7 +15,7 @@ defaultmap="co_core"
 maxplayers="24"
 servername="LinuxGSM"
 httpuser="admin"
-httppassword="admin"
+httppassword="CHANGE_ME"
 httpport="8080"
 mods=""
 serverpassword=""
@@ -24,7 +24,7 @@ serverpassword=""
 # -password \"${serverpassword}\"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${httpuser} -webpassword \"${httppassword}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
+startparameters="-name '${servername}' -port ${port} -webadmin -webdomain ${ip} -webuser ${httpuser} -webpassword '${httppassword}' -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path '${servercfgdir}' -modstorage '${modstoragedir}' -mods '${mods}'"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/ns2server/_default.cfg

@@ -12,19 +12,20 @@
 ip="0.0.0.0"
 port="27015"
 defaultmap="ns2_summit"
-maxplayers="24"
+maxplayers="20"
+maxspectators="5"
 servername="LinuxGSM"
 httpuser="admin"
-httppassword="admin"
+httppassword="CHANGE_ME"
 httpport="8080"
-mods=""
+modserverport="27031"
 serverpassword=""
 # Add the following line to the parms if you want a private server. Ensuring
 # that the password variable above is not left empty.
-# -password \"${serverpassword}\"
+# -password '${serverpassword}'
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${httpuser} -webpassword \"${httppassword}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods2 \"${mods}\""
+startparameters="-name '${servername}' -port ${port} -webadmin -webdomain ${ip} -webuser ${httpuser} -webpassword '${httppassword}' -webport ${httpport} -startmodserver -modserverport ${modserverport} -map ${defaultmap} -limit ${maxplayers} -speclimit ${maxspectators} -config_path '${servercfgdir}' -logdir '${gamelogdir}' -modstorage '${modstoragedir}'"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/ohdserver/_default.cfg

@@ -12,14 +12,14 @@
 ip="0.0.0.0"
 port="7777"
 queryport="27005"
+rconport="7778"
 servername="LinuxGSM"
-serverpassword=""
 # Maps: risala, khafji_p, lamdong, montecassino, argonne
 defaultmap="AAS-TestMap"
 maxplayers="16"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${defaultmap}?MaxPlayers=${maxplayers}?Password=${serverpassword} -Port=${port} -QueryPort=${queryport} -SteamServerName='${servername}' -log"
+startparameters="${defaultmap}?MaxPlayers=${maxplayers} -MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -RconPort=${rconport} -SteamServerName='${servername}' -log"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/onsetserver/_default.cfg

@@ -9,6 +9,7 @@
 #### Game Server Settings ####
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+## Game Server Docs | https://dev.playonset.com/wiki/DedicatedServer
 startparameters="--config ${servercfgfullpath}"
 
 #### LinuxGSM Settings ####

lgsm/config-default/config-lgsm/psserver/_default.cfg

@@ -10,15 +10,11 @@
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
-maxplayers="40"
 port="10027"
 queryport="10037"
-randommap="NONE"
-reservedslots="0"
-tickrate="50"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="MULTIHOME=${ip} RANDOM=${randommap} Port=${port} QueryPort=${queryport} FIXEDMAXPLAYERS=${maxplayers} FIXEDMAXTICKRATE=${tickrate} NumReservedSlots=${reservedslots}"
+startparameters="-MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -log"
 
 #### LinuxGSM Settings ####
 

lgsm/config-default/config-lgsm/pvrserver/_default.cfg

@@ -17,7 +17,8 @@ defaultmap="datacenter"
 apikey=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="Pavlov ${defaultmap} -log -MultiHome=${ip} -Port=${port} ApiKey=${apikey}"
+## Game Server Docs | http://pavlovwiki.com/index.php/Setting_up_a_dedicated_server
+startparameters="Pavlov ${defaultmap} -MultiHome=${ip} -Port=${port} ApiKey=${apikey} -log"
 
 #### LinuxGSM Settings ####
 
@@ -149,7 +150,7 @@ consoleinteract="no"
 ## Game Server Details
 # Do not edit
 gamename="Pavlov VR"
-engine="unreal4"
+engine="unreal5"
 glibc="2.17"
 
 #### Directories ####

lgsm/config-default/config-lgsm/q3server/_default.cfg

@@ -14,7 +14,7 @@ port="27960"
 defaultmap="q3dm17"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}"
+startparameters="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 2 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +map ${defaultmap} +exec ${servercfg}"
 
 #### LinuxGSM Settings ####