Merge branch 'release/v21.1.0'

GameServerManagers · Jan 27, 2021 · 157533c · 157533c
2 parents 3fa9376 + 25d344f
commit 157533c
Show file tree

Hide file tree

Showing 262 changed files with 2,475 additions and 1,115 deletions.
diff --git a/lgsm/config-default/config-lgsm/acserver/_default.cfg b/lgsm/config-default/config-lgsm/acserver/_default.cfg
@@ -15,9 +15,7 @@ steampass='password'
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-c ${servercfgfullpath}"
-}
+startparameters="-c ${servercfgfullpath}"
 
 #### LinuxGSM Settings ####
 
@@ -112,6 +110,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="302550"
+steamcmdforcewindows="yes"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/ahl2server/_default.cfg b/lgsm/config-default/config-lgsm/ahl2server/_default.cfg
@@ -21,9 +21,7 @@ defaultmap="act_airport"
 maxplayers="20"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game ahl2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game ahl2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -115,6 +113,16 @@ ansi="on"
 ## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
 sleeptime="0.5"
 
+## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
+# Server appid
+appid="985050"
+steamcmdforcewindows="no"
+# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
+branch=""
+betapassword=""
+# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
+steammaster="true"
+
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill
 # 2: CTRL+c
@@ -138,14 +146,6 @@ stopmode="3"
 querymode="2"
 querytype="protocol-valve"
 
-## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
-# Server appid
-appid="985050"
-# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
-branch=""
-betapassword=""
-# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="true"
 
 ## Console type
 consoleverbose="yes"

diff --git a/lgsm/config-default/config-lgsm/ahlserver/_default.cfg b/lgsm/config-default/config-lgsm/ahlserver/_default.cfg
@@ -16,9 +16,7 @@ defaultmap="ahl_hydro"
 maxplayers="16"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game action -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} "
-}
+startparameters="-game action -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} "
 
 #### LinuxGSM Settings ####
 
@@ -113,6 +111,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="90"
+steamcmdforcewindows="no"
 appidmod="cstrike"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""

diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg
@@ -19,9 +19,7 @@ altsavedirectoryname="${defaultmap}"
 maxplayers="70"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${ip}"
-}
+startparameters="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${ip}"
 
 #### LinuxGSM Settings ####
 
@@ -116,6 +114,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="376030"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg
@@ -32,9 +32,7 @@ servermods=""
 bepath=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-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 ####
 
@@ -129,6 +127,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="233780"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""
@@ -174,7 +173,7 @@ glibc="2.13"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-executable="./arma3server"
+executable="./arma3server_64"
 servercfgdir="${systemdir}/cfg"
 servercfg="${selfname}.server.cfg"
 servercfgdefault="server.cfg"

diff --git a/lgsm/config-default/config-lgsm/avserver/_default.cfg b/lgsm/config-default/config-lgsm/avserver/_default.cfg
@@ -12,14 +12,12 @@
 port="27000"
 # https://steamidfinder.com
 adminsteamid=""
-
-## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-if [ ! -z "${adminsteamid}" ]; then
+if [ -n "${adminsteamid}" ]; then
 	admincmd="--admin ${adminsteamid}"
 fi
-parms="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}"
-}
+
+## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+startparameters="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}"
 
 #### LinuxGSM Settings ####
 
@@ -28,6 +26,7 @@ parms="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}
 # https://docs.linuxgsm.com/configuration/linuxgsm-stats
 # (on|off)
 stats="off"
+
 ## Notification Alerts
 # (on|off)
 
@@ -109,9 +108,11 @@ ansi="on"
 
 ## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
 sleeptime="0.5"
+
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="565060"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""
@@ -141,6 +142,10 @@ stopmode="10"
 querymode="5"
 querytype=""
 
+## Console type
+consoleverbose="yes"
+consoleinteract="yes"
+
 ## Game Server Details
 # Do not edit
 gamename="Avorion"

diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg
@@ -22,9 +22,7 @@ maxplayers="20"
 gslt=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game brainbread2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game brainbread2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -119,6 +117,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="475370"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg
@@ -16,9 +16,7 @@ defaultmap="bb_chp4_slaywatch"
 maxplayers="16"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -113,6 +111,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="90"
+steamcmdforcewindows="no"
 appidmod="cstrike"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""

diff --git a/lgsm/config-default/config-lgsm/bdserver/_default.cfg b/lgsm/config-default/config-lgsm/bdserver/_default.cfg
@@ -16,9 +16,7 @@ defaultmap="pve_tomb"
 maxplayers="3"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game bdef -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game bdef -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -113,6 +111,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="817300"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
@@ -9,9 +9,7 @@
 #### Game Server Settings ####
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="+hostServer 1 +dedicated 1"
-}
+startparameters="+hostServer 1 +dedicated 1"
 
 #### LinuxGSM Settings ####
 

diff --git a/lgsm/config-default/config-lgsm/bfvserver/_default.cfg b/lgsm/config-default/config-lgsm/bfvserver/_default.cfg
@@ -9,9 +9,7 @@
 #### Game Server Settings ####
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="+statusMonitor 1"
-}
+startparameters="+statusMonitor 1"
 
 #### LinuxGSM Settings ####
 

diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
@@ -22,9 +22,7 @@ maxplayers="16"
 gslt=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -119,6 +117,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="346680"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg
@@ -15,9 +15,7 @@ gslt=""
 ip=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-batchmode -nographics -dedicated -configfile=${servercfgfullpath}"
-}
+startparameters="-batchmode -nographics -dedicated -configfile=${servercfgfullpath}"
 
 #### LinuxGSM Settings ####
 
@@ -112,6 +110,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="416880"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg
@@ -26,9 +26,7 @@ maxplayers="16"
 gslt=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game "${serverfiles}/berimbau" -autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game "${serverfiles}/berimbau" -autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -123,6 +121,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="228780"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg
@@ -14,9 +14,7 @@ port="7777"
 queryport="7780"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="/Game/Maps/Final_Maps/Derailed?Game=/Script/ShooterGame.WartideGameMode?listen -log -broadcastip=\"${extip}\" -PORT=${port} -QueryPort=${queryport} -defgameini=\"${servercfgfullpath}\""
-}
+startparameters="/Game/Maps/Final_Maps/Derailed?Game=/Script/ShooterGame.WartideGameMode?listen -log -broadcastip=\"${extip}\" -PORT=${port} -QueryPort=${queryport} -defgameini=\"${servercfgfullpath}\""
 
 #### LinuxGSM Settings ####
 
@@ -111,6 +109,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="805140"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""
@@ -161,6 +160,7 @@ servercfgdir="${systemdir}/Saved/Config/LinuxServer"
 servercfg="${selfname}.ini"
 servercfgdefault="DefaultGame.ini"
 servercfgfullpath="${servercfgdir}/${servercfg}"
+
 ## Backup Directory
 backupdir="${lgsmdir}/backup"
 

diff --git a/lgsm/config-default/config-lgsm/btserver/_default.cfg b/lgsm/config-default/config-lgsm/btserver/_default.cfg
@@ -9,9 +9,7 @@
 #### Game Server Settings ####
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms=""
-}
+startparameters=""
 
 #### LinuxGSM Settings ####
 
@@ -106,6 +104,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="1026340"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""

diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg
@@ -17,9 +17,7 @@ defaultmap="cbe_bunker"
 maxplayers="6"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-fn_parms(){
-parms="-game cure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
-}
+startparameters="-game cure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 
 #### LinuxGSM Settings ####
 
@@ -114,6 +112,7 @@ sleeptime="0.5"
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
 appid="383410"
+steamcmdforcewindows="no"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""