From 4599551e27097f03119141251c4f6d2f82c749b4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 27 May 2017 11:11:55 +0100 Subject: [PATCH] Changed to serverfies --- .../config-default/config-lgsm/csczserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/cssserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/dabserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/dmcserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/dodserver/_default.cfg | 4 ++-- .../config-default/config-lgsm/dodsserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/doiserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/dstserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/emserver/_default.cfg | 4 ++-- .../config-default/config-lgsm/fctrserver/_default.cfg | 10 +++++----- lgsm/config-default/config-lgsm/fofserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/gesserver/_default.cfg | 4 ++-- .../config-default/config-lgsm/gmodserver/_default.cfg | 4 ++-- .../config-lgsm/hl2dmserver/_default.cfg | 4 ++-- .../config-default/config-lgsm/hldmserver/_default.cfg | 4 ++-- .../config-lgsm/hldmsserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/hwserver/_default.cfg | 6 +++--- lgsm/config-default/config-lgsm/insserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/jc2server/_default.cfg | 6 +++--- lgsm/config-default/config-lgsm/kfserver/_default.cfg | 2 +- .../config-default/config-lgsm/l4d2server/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/l4dserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/mcserver/_default.cfg | 10 +++++----- lgsm/config-default/config-lgsm/mtaserver/_default.cfg | 4 ++-- .../config-lgsm/mumbleserver/_default.cfg | 6 +++--- .../config-lgsm/nmrihserver/_default.cfg | 4 ++-- .../config-default/config-lgsm/ns2cserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/ns2server/_default.cfg | 4 ++-- .../config-lgsm/opforserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/pcserver/_default.cfg | 4 ++-- .../config-lgsm/pvkiiserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/pzserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/q2server/_default.cfg | 6 +++--- lgsm/config-default/config-lgsm/q3server/_default.cfg | 8 ++++---- lgsm/config-default/config-lgsm/qlserver/_default.cfg | 6 +++--- lgsm/config-default/config-lgsm/qwserver/_default.cfg | 4 ++-- .../config-lgsm/ricochetserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/roserver/_default.cfg | 4 ++-- .../config-default/config-lgsm/rustserver/_default.cfg | 6 +++--- lgsm/config-default/config-lgsm/sbserver/_default.cfg | 8 ++++---- lgsm/config-default/config-lgsm/ss3server/_default.cfg | 4 ++-- .../config-default/config-lgsm/svenserver/_default.cfg | 4 ++-- .../config-lgsm/terrariaserver/_default.cfg | 6 +++--- lgsm/config-default/config-lgsm/tf2server/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/tfcserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/ts3server/_default.cfg | 8 ++++---- lgsm/config-default/config-lgsm/tuserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/twserver/_default.cfg | 4 ++-- .../config-lgsm/ut2k4server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 2 +- .../config-default/config-lgsm/ut99server/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/utserver/_default.cfg | 4 ++-- lgsm/config-default/config-lgsm/wetserver/_default.cfg | 6 +++--- 53 files changed, 122 insertions(+), 122 deletions(-) diff --git a/lgsm/config-default/config-lgsm/csczserver/_default.cfg b/lgsm/config-default/config-lgsm/csczserver/_default.cfg index b1a3ea20a..3f1a44c15 100644 --- a/lgsm/config-default/config-lgsm/csczserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csczserver/_default.cfg @@ -69,8 +69,8 @@ servicename="cscz-server" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/czero" -executabledir="${filesdir}" +systemdir="${serverfiles}/czero" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/cssserver/_default.cfg b/lgsm/config-default/config-lgsm/cssserver/_default.cfg index 4d898a416..485bba577 100644 --- a/lgsm/config-default/config-lgsm/cssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/cssserver/_default.cfg @@ -71,8 +71,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/cstrike" -executabledir="${filesdir}" +systemdir="${serverfiles}/cstrike" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/dabserver/_default.cfg b/lgsm/config-default/config-lgsm/dabserver/_default.cfg index 276b112f3..3d00db3a2 100644 --- a/lgsm/config-default/config-lgsm/dabserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dabserver/_default.cfg @@ -66,8 +66,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/dab" -executabledir="${filesdir}" +systemdir="${serverfiles}/dab" +executabledir="${serverfiles}" executable="./dabds.sh" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg index 2bf28c698..e5b32111f 100644 --- a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg @@ -66,8 +66,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/dmc" -executabledir="${filesdir}" +systemdir="${serverfiles}/dmc" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/dodserver/_default.cfg b/lgsm/config-default/config-lgsm/dodserver/_default.cfg index b943c41a3..8d16ea264 100644 --- a/lgsm/config-default/config-lgsm/dodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodserver/_default.cfg @@ -66,8 +66,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/dod" -executabledir="${filesdir}" +systemdir="${serverfiles}/dod" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg index f40ef5451..f4bf101c1 100644 --- a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg @@ -66,8 +66,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/dod" -executabledir="${filesdir}" +systemdir="${serverfiles}/dod" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg index 6652f72d9..f32e6137e 100644 --- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg @@ -68,8 +68,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/doi" -executabledir="${filesdir}" +systemdir="${serverfiles}/doi" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/dstserver/_default.cfg b/lgsm/config-default/config-lgsm/dstserver/_default.cfg index 204b9443a..9a9f964c9 100644 --- a/lgsm/config-default/config-lgsm/dstserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dstserver/_default.cfg @@ -72,8 +72,8 @@ servicename="dst-server-${shard}" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}/bin" +systemdir="${serverfiles}" +executabledir="${serverfiles}/bin" executable="./dontstarve_dedicated_server_nullrenderer" clustercfg="cluster.ini" clustercfgdir="${persistentstorageroot}/${confdir}/${cluster}" diff --git a/lgsm/config-default/config-lgsm/emserver/_default.cfg b/lgsm/config-default/config-lgsm/emserver/_default.cfg index 4faa1aeb6..e818e87de 100644 --- a/lgsm/config-default/config-lgsm/emserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/emserver/_default.cfg @@ -71,8 +71,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/empires" -executabledir="${filesdir}" +systemdir="${serverfiles}/empires" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg index a7b0da679..ff9d72db1 100644 --- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg @@ -16,7 +16,7 @@ rconpassword="CHANGE_ME" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="--start-server ${filesdir}/save1.zip --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}" +parms="--start-server ${serverfiles}/save1.zip --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}" } #### LinuxGSM Settings #### @@ -56,19 +56,19 @@ engine="factorio" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}/bin/x64" +systemdir="${serverfiles}" +executabledir="${serverfiles}/bin/x64" executable="./factorio" servercfg="${servicename}.json" servercfgdefault="server-settings.json" -servercfgdir="${filesdir}/data" +servercfgdir="${serverfiles}/data" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory backupdir="${rootdir}/backups" ## Logging Directories -gamelogdir="${filesdir}" +gamelogdir="${serverfiles}" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/fofserver/_default.cfg b/lgsm/config-default/config-lgsm/fofserver/_default.cfg index 3d9b9f977..eacb85911 100644 --- a/lgsm/config-default/config-lgsm/fofserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fofserver/_default.cfg @@ -66,8 +66,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/fof" -executabledir="${filesdir}" +systemdir="${serverfiles}/fof" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/gesserver/_default.cfg b/lgsm/config-default/config-lgsm/gesserver/_default.cfg index f469b6ab8..8faf185e1 100644 --- a/lgsm/config-default/config-lgsm/gesserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gesserver/_default.cfg @@ -65,8 +65,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/gesource" -executabledir="${filesdir}" +systemdir="${serverfiles}/gesource" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index 2a57cf06f..d04ccbfdb 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -81,9 +81,9 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/garrysmod" +systemdir="${serverfiles}/garrysmod" addonsdir="${systemdir}/addons" -executabledir="${filesdir}" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg index ec4ecd9e5..d26929139 100644 --- a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg @@ -66,8 +66,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/hl2mp" -executabledir="${filesdir}" +systemdir="${serverfiles}/hl2mp" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg index 7f01e865d..ca3c9a228 100644 --- a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg @@ -65,8 +65,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/valve" -executabledir="${filesdir}" +systemdir="${serverfiles}/valve" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg index ba4144d2c..446e0545e 100644 --- a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg @@ -66,8 +66,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/hl1mp" -executabledir="${filesdir}" +systemdir="${serverfiles}/hl1mp" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/hwserver/_default.cfg b/lgsm/config-default/config-lgsm/hwserver/_default.cfg index fb496fbb5..69f0dacc6 100644 --- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg @@ -86,11 +86,11 @@ lgsmdir="${rootdir}/lgsm" functionsdir="${lgsmdir}/functions" libdir="${lgsmdir}/lib" tmpdir="${lgsmdir}/tmp" -filesdir="${rootdir}/serverfiles" +serverfiles="${rootdir}/serverfiles" ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" if [ "${x64mode}" == "1" ]; then executable="./Hurtworld.x86_64" else diff --git a/lgsm/config-default/config-lgsm/insserver/_default.cfg b/lgsm/config-default/config-lgsm/insserver/_default.cfg index c8918645d..94102ad1a 100644 --- a/lgsm/config-default/config-lgsm/insserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/insserver/_default.cfg @@ -68,8 +68,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/insurgency" -executabledir="${filesdir}" +systemdir="${serverfiles}/insurgency" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg index 3d358bc2b..3c5ef330a 100644 --- a/lgsm/config-default/config-lgsm/jc2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc2server/_default.cfg @@ -58,12 +58,12 @@ engine="avalanche" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./Jcmp-Server" servercfg="config.lua" servercfgdefault="config.lua" -servercfgdir="${filesdir}" +servercfgdir="${serverfiles}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg index 6142eb4ec..982e6a6a1 100644 --- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg @@ -70,7 +70,7 @@ engine="unreal2" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/System" +systemdir="${serverfiles}/System" executabledir="${systemdir}" executable="./ucc-bin" servercfg="${servicename}.ini" diff --git a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg index 9c9046c02..17448efda 100644 --- a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg @@ -65,8 +65,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/left4dead2" -executabledir="${filesdir}" +systemdir="${serverfiles}/left4dead2" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg index 73c940e20..6c558a8af 100644 --- a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg @@ -65,8 +65,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/left4dead" -executabledir="${filesdir}" +systemdir="${serverfiles}/left4dead" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index c23547386..03527e7a6 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -57,15 +57,15 @@ selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" lockselfname=".${servicename}.lock" lgsmdir="${rootdir}/lgsm" functionsdir="${lgsmdir}/functions" -filesdir="${rootdir}/serverfiles" +serverfiles="${rootdir}/serverfiles" ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" -executable="java -Xmx${javaram}M -jar ${filesdir}/minecraft_server.jar" +systemdir="${serverfiles}" +executabledir="${serverfiles}" +executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar" servercfg="server.properties" servercfgdefault="server.properties" -servercfgdir="${filesdir}" +servercfgdir="${serverfiles}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg index 909565c46..7dad5a1c8 100644 --- a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg @@ -48,7 +48,7 @@ engine="renderware" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" +systemdir="${serverfiles}" resourcesdir="${systemdir}/mods/deathmatch/resources" executabledir="${systemdir}" executable="./mta-server64" @@ -61,7 +61,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/mods/deathmatch/logs" +gamelogdir="${serverfiles}/mods/deathmatch/logs" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg index aece97398..40d127f6b 100644 --- a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg @@ -50,12 +50,12 @@ gamename="Mumble" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./murmur.x86" servercfg="${servicename}.ini" servercfgdefault="murmur.ini" -servercfgdir="${filesdir}" +servercfgdir="${serverfiles}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg index e033af129..388614101 100644 --- a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg @@ -71,8 +71,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/nmrih" -executabledir="${filesdir}" +systemdir="${serverfiles}/nmrih" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg index 252e20729..a5bacf18d 100644 --- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg @@ -77,8 +77,8 @@ engine="spark" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}/ia32" +systemdir="${serverfiles}" +executabledir="${serverfiles}/ia32" executable="./ns2combatserver_linux32" servercfgdir="${rootdir}/server1" servercfgfullpath="${servercfgdir}" diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg index 6b058c288..9c40ed3a9 100644 --- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg @@ -77,8 +77,8 @@ engine="spark" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./server_linux32" servercfgdir="${rootdir}/server1" servercfgfullpath="${servercfgdir}" diff --git a/lgsm/config-default/config-lgsm/opforserver/_default.cfg b/lgsm/config-default/config-lgsm/opforserver/_default.cfg index a61a4b4d2..f5ea12e1b 100644 --- a/lgsm/config-default/config-lgsm/opforserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/opforserver/_default.cfg @@ -66,8 +66,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/gearbox" -executabledir="${filesdir}" +systemdir="${serverfiles}/gearbox" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/pcserver/_default.cfg b/lgsm/config-default/config-lgsm/pcserver/_default.cfg index e0398c448..337940261 100644 --- a/lgsm/config-default/config-lgsm/pcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pcserver/_default.cfg @@ -59,8 +59,8 @@ engine="madness" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./DedicatedServerCmd" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg index 32888b654..09424358e 100644 --- a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg @@ -66,8 +66,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/pvkii" -executabledir="${filesdir}" +systemdir="${serverfiles}/pvkii" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/pzserver/_default.cfg b/lgsm/config-default/config-lgsm/pzserver/_default.cfg index 004bb6378..a1542cf7c 100644 --- a/lgsm/config-default/config-lgsm/pzserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pzserver/_default.cfg @@ -61,8 +61,8 @@ engine="projectzomboid" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./start-server.sh" servercfg="${servicename}.ini" servercfgdefault="server.ini" diff --git a/lgsm/config-default/config-lgsm/q2server/_default.cfg b/lgsm/config-default/config-lgsm/q2server/_default.cfg index 5abcaa974..b9530b05e 100644 --- a/lgsm/config-default/config-lgsm/q2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q2server/_default.cfg @@ -52,8 +52,8 @@ engine="idtech2" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/baseq2" -executabledir="${filesdir}" +systemdir="${serverfiles}/baseq2" +executabledir="${serverfiles}" executable="./quake2" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" @@ -65,7 +65,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/Logs" +gamelogdir="${serverfiles}/Logs" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/q3server/_default.cfg b/lgsm/config-default/config-lgsm/q3server/_default.cfg index 028d45229..026bbfc7a 100644 --- a/lgsm/config-default/config-lgsm/q3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q3server/_default.cfg @@ -15,7 +15,7 @@ defaultmap="q3dm17" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}" +parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}" } #### LinuxGSM Settings #### @@ -52,8 +52,8 @@ engine="idtech3" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/baseq3" -executabledir="${filesdir}" +systemdir="${serverfiles}/baseq3" +executabledir="${serverfiles}" executable="./q3ded" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" @@ -65,7 +65,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/Logs" +gamelogdir="${serverfiles}/Logs" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg index 22ef3204f..a7fc888ee 100644 --- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg @@ -63,12 +63,12 @@ engine="idtech3_ql" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable=$([ "${arch}" == 'x64' ] && echo "./run_server_x64.sh" || echo "./run_server_x86.sh") servercfg="${servicename}.cfg" servercfgdefault="server.cfg" -servercfgdir="${filesdir}/baseq3" +servercfgdir="${serverfiles}/baseq3" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/qwserver/_default.cfg b/lgsm/config-default/config-lgsm/qwserver/_default.cfg index 04eb9a69a..f22983a4d 100644 --- a/lgsm/config-default/config-lgsm/qwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qwserver/_default.cfg @@ -51,8 +51,8 @@ engine="quake" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/ktx" -executabledir="${filesdir}" +systemdir="${serverfiles}/ktx" +executabledir="${serverfiles}" executable="./mvdsv" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg index c0301588d..6779cb2eb 100644 --- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg @@ -85,8 +85,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/ricochet" -executabledir="${filesdir}" +systemdir="${serverfiles}/ricochet" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index f0c1ac587..a076a8243 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -75,8 +75,8 @@ libdir="${lgsmdir}/lib" tmpdir="${lgsmdir}/tmp" ## Server Specific Directories -filesdir="${rootdir}/serverfiles" -systemdir="${filesdir}/system" +serverfiles="${rootdir}/serverfiles" +systemdir="${serverfiles}/system" executabledir="${systemdir}" executable="./ucc-bin" servercfg="${servicename}.ini" diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg index 9d898f131..74176bd96 100644 --- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg @@ -89,11 +89,11 @@ lgsmdir="${rootdir}/lgsm" functionsdir="${lgsmdir}/functions" libdir="${lgsmdir}/lib" tmpdir="${lgsmdir}/tmp" -filesdir="${rootdir}/serverfiles" +serverfiles="${rootdir}/serverfiles" ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./RustDedicated" serveridentitydir="${systemdir}/server/${servicename}" servercfg="server.cfg" diff --git a/lgsm/config-default/config-lgsm/sbserver/_default.cfg b/lgsm/config-default/config-lgsm/sbserver/_default.cfg index 3a1a5989f..634434a1c 100644 --- a/lgsm/config-default/config-lgsm/sbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbserver/_default.cfg @@ -65,12 +65,12 @@ engine="starbound" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}/linux" +systemdir="${serverfiles}" +executabledir="${serverfiles}/linux" executable="./starbound_server" servercfg="starbound_server.config" servercfgdefault="starbound_server.config" -servercfgdir="${filesdir}/storage" +servercfgdir="${serverfiles}/storage" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory @@ -78,7 +78,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/storage" +gamelogdir="${serverfiles}/storage" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg index fadf636cc..399fb82ac 100644 --- a/lgsm/config-default/config-lgsm/ss3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ss3server/_default.cfg @@ -62,12 +62,12 @@ engine="seriousengine35" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/Bin" +systemdir="${serverfiles}/Bin" executable="./runSam3_DedicatedServer.sh" executabledir="${systemdir}" servercfg="${servicename}.ini" servercfgdefault="server.ini" -servercfgdir="${filesdir}/Content/SeriousSam3/Config" +servercfgdir="${serverfiles}/Content/SeriousSam3/Config" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/svenserver/_default.cfg b/lgsm/config-default/config-lgsm/svenserver/_default.cfg index 720f1248c..8d5f4d37b 100644 --- a/lgsm/config-default/config-lgsm/svenserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/svenserver/_default.cfg @@ -65,8 +65,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/svencoop" -executabledir="${filesdir}" +systemdir="${serverfiles}/svencoop" +executabledir="${serverfiles}" executable="./svends_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg index 1cf4f0570..60c3500ac 100644 --- a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg @@ -65,12 +65,12 @@ engine="terraria" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./TerrariaServer" servercfg="${servicename}.txt" servercfgdefault="serverconfig.txt" -servercfgdir="${filesdir}" +servercfgdir="${serverfiles}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/tf2server/_default.cfg b/lgsm/config-default/config-lgsm/tf2server/_default.cfg index fca2e5bc1..549cc75b7 100644 --- a/lgsm/config-default/config-lgsm/tf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/tf2server/_default.cfg @@ -71,8 +71,8 @@ engine="source" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/tf" -executabledir="${filesdir}" +systemdir="${serverfiles}/tf" +executabledir="${serverfiles}" executable="./srcds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg index 2f7a9dd97..94036e218 100644 --- a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg @@ -66,8 +66,8 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/tfc" -executabledir="${filesdir}" +systemdir="${serverfiles}/tfc" +executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" servercfgdefault="server.cfg" diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg index 487254215..192d8be34 100644 --- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg @@ -46,12 +46,12 @@ servername="TeamSpeak 3 Server" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" -executabledir="${filesdir}" +systemdir="${serverfiles}" +executabledir="${serverfiles}" executable="./ts3server_startscript.sh" servercfg="${servicename}.ini" servercfgdefault="ts3server.ini" -servercfgdir="${filesdir}" +servercfgdir="${serverfiles}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory @@ -59,7 +59,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/Logs" +gamelogdir="${serverfiles}/Logs" scriptlogdir="${rootdir}/log/script" scriptlog="${scriptlogdir}/${servicename}-script.log" emaillog="${scriptlogdir}/${servicename}-email.log" diff --git a/lgsm/config-default/config-lgsm/tuserver/_default.cfg b/lgsm/config-default/config-lgsm/tuserver/_default.cfg index f92175880..4c53d4e7b 100644 --- a/lgsm/config-default/config-lgsm/tuserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tuserver/_default.cfg @@ -63,7 +63,7 @@ engine="unreal4" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/Tower" +systemdir="${serverfiles}/Tower" executabledir="${systemdir}/Binaries/Linux" executable="./TowerServer-Linux-Shipping" servercfgdir="${systemdir}/Binaries/Linux" diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg index 59b843bc0..8d2b0b3b3 100644 --- a/lgsm/config-default/config-lgsm/twserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/twserver/_default.cfg @@ -65,12 +65,12 @@ engine="teeworlds" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/tw" +systemdir="${serverfiles}/tw" executabledir="${systemdir}" executable="./teeworlds_srv" servercfg="${servicename}.cfg" # Teeworlds can also auto load any config if an autoexec.cfg file is present in the server dir servercfgdefault="server.cfg" -servercfgdir="${filesdir}" +servercfgdir="${serverfiles}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory diff --git a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg index e6e88a063..ab9bc3e48 100644 --- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg @@ -51,7 +51,7 @@ engine="unreal2" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/System" +systemdir="${serverfiles}/System" executabledir="${systemdir}" executable="./ucc-bin" servercfg="${servicename}.ini" diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index fbc0c0c4b..bb896fd80 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -63,7 +63,7 @@ engine="unreal3" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" +systemdir="${serverfiles}" executabledir="${systemdir}/Binaries" executable="./ut3" servercfg="${servicename}.ini" diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg index ff405ee3f..cc1e29ae6 100644 --- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg @@ -51,7 +51,7 @@ engine="unreal" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/System" +systemdir="${serverfiles}/System" executabledir="${systemdir}" executable="./ucc-bin" servercfg="${servicename}.ini" @@ -65,7 +65,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/Logs" +gamelogdir="${serverfiles}/Logs" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/utserver/_default.cfg b/lgsm/config-default/config-lgsm/utserver/_default.cfg index dfeb0ad9d..6f9451913 100644 --- a/lgsm/config-default/config-lgsm/utserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/utserver/_default.cfg @@ -55,7 +55,7 @@ engine="unreal4" # Edit with care ## Server Specific Directories -systemdir="${filesdir}/LinuxServer" +systemdir="${serverfiles}/LinuxServer" executabledir="${systemdir}/Engine/Binaries/Linux" executable="./UE4Server-Linux-Shipping" servercfg="Game.ini" @@ -67,7 +67,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/Logs" +gamelogdir="${serverfiles}/Logs" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log" diff --git a/lgsm/config-default/config-lgsm/wetserver/_default.cfg b/lgsm/config-default/config-lgsm/wetserver/_default.cfg index a8e98871e..29e60593a 100644 --- a/lgsm/config-default/config-lgsm/wetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wetserver/_default.cfg @@ -10,7 +10,7 @@ ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ - parms="+set net_strict 1 +set fs_homepath ${filesdir} +exec ${servercfg}" + parms="+set net_strict 1 +set fs_homepath ${serverfiles} +exec ${servercfg}" } #### LinuxGSM Settings #### @@ -47,7 +47,7 @@ engine="idtech3" # Edit with care ## Server Specific Directories -systemdir="${filesdir}" +systemdir="${serverfiles}" executabledir="${systemdir}" executable="./etded" servercfg="${servicename}.cfg" @@ -60,7 +60,7 @@ backupdir="${rootdir}/backups" ## Logging Directories logdir="${rootdir}/log" -gamelogdir="${filesdir}/Logs" +gamelogdir="${serverfiles}/Logs" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" lgsmlog="${lgsmlogdir}/${servicename}-script.log"