From 10eb855faadb8dd19bd44db5a4701b736e428910 Mon Sep 17 00:00:00 2001 From: Drizzt321 Date: Wed, 19 Jul 2017 17:26:25 -0700 Subject: [PATCH 01/57] Symlinking the SteamCMD dir for ARK Symlinking the SteamCMD directory into the correct ARK directory so that the mods auto-management will work fine. See http://ark.gamepedia.com/244.3 for the CLI option and Game.ini configuration settings. --- lgsm/functions/command_install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index 0a4f03cee..8500ebb6b 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -39,6 +39,8 @@ elif [ "${gamename}" == "TeamSpeak 3" ]; then install_ts3db.sh elif [ "${gamename}" == "Multi Theft Auto" ]; then command_install_resources_mta.sh +elif [ "${gamename}" == "ARK: Survival Evolved" ]; then + ln -s "${steamcmddir}" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" fi fix.sh From 8ec1c362ef809461e312b10cbf9369fa3332ee72 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 6 Sep 2017 11:27:32 +0100 Subject: [PATCH 02/57] migrated to fix_ark.sh --- lgsm/functions/command_install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index 8500ebb6b..0a4f03cee 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -39,8 +39,6 @@ elif [ "${gamename}" == "TeamSpeak 3" ]; then install_ts3db.sh elif [ "${gamename}" == "Multi Theft Auto" ]; then command_install_resources_mta.sh -elif [ "${gamename}" == "ARK: Survival Evolved" ]; then - ln -s "${steamcmddir}" "${serverfiles}/Engine/Binaries/ThirdParty/SteamCMD/Linux" fi fix.sh From c065d6d79fd122e9fca768949c8d4ef42e100898 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 21:42:42 +0100 Subject: [PATCH 03/57] Added Killing Floor 2 --- lgsm/functions/install_config.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 1a184acf1..ff333cdaf 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -342,6 +342,12 @@ elif [ "${gamename}" == "Killing Floor" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Killing Floor 2" ]; then + gamedirname="KillingFloor2" + array_configs+=( LinuxServer-KFGame.ini LinuxServer-KFEngine.ini KFWeb.ini ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "Left 4 Dead" ]; then gamedirname="Left4Dead" array_configs+=( server.cfg ) From 5589e2d2cc8861fb240a3fe803b2084746359da5 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 21:44:55 +0100 Subject: [PATCH 04/57] Killing Floor 2 --- lgsm/data/serverlist.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 758eea30c..b38a0233d 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -34,6 +34,7 @@ hw,hwserver,Hurtworld ins,insserver,Insurgency jc2,jc2server,Just Cause 2 kf,kfserver,Killing Floor +kf2,kf2server,Killing Floor 2 l4d,l4dserver,Left 4 Dead l4d2,l4d2server,Left 4 Dead 2 mc,mcserver,Minecraft From beb3bdefd6905f48dc53fc51f0d1c8e1c2bd6e6c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 21:51:15 +0100 Subject: [PATCH 05/57] Killing Floor 2 default.cfg --- .../config-lgsm/kf2server/_default.cfg | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/kf2server/_default.cfg diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg new file mode 100644 index 000000000..470f929c6 --- /dev/null +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -0,0 +1,125 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="7777" +queryport="27015" +rconport="27020" +maxplayers="12" +webadminuser="admin" +webadminpass="admin" +webadminport="8080" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="\"KF-BurningParis?Game=KFGameContent.KFGameInfo_VersusSurvival?maxplayers=${maxplayers}\"" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="232130" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Killing Floor 2" +engine="unreal3" + +#### Directories #### +# Edit with care +## Server Specific Directories +systemdir="${serverfiles}" +executabledir="${systemdir}/Binaries/Win64" +executable="./KFGameSteamServer.bin.x86_64" +servercfgdir="${systemdir}/Saved/Config/LinuxServer" +servercfg="GameUserSettings.ini" +servercfgdefault="" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${lgsmdir}/backup" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/Saved/Logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" + From 42fc81b7ccd59c844ed1925c813835ca31522b92 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 21:54:35 +0100 Subject: [PATCH 06/57] servercfg blank --- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index 470f929c6..1a1e5c816 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -102,7 +102,7 @@ systemdir="${serverfiles}" executabledir="${systemdir}/Binaries/Win64" executable="./KFGameSteamServer.bin.x86_64" servercfgdir="${systemdir}/Saved/Config/LinuxServer" -servercfg="GameUserSettings.ini" +servercfg="" servercfgdefault="" servercfgfullpath="${servercfgdir}/${servercfg}" From 2457f273f5eace45a748704f259a182a23a19896 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 21:58:27 +0100 Subject: [PATCH 07/57] added KFGame.ini as default cfg --- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index 1a1e5c816..f4e5bf5b1 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -102,8 +102,8 @@ systemdir="${serverfiles}" executabledir="${systemdir}/Binaries/Win64" executable="./KFGameSteamServer.bin.x86_64" servercfgdir="${systemdir}/Saved/Config/LinuxServer" -servercfg="" -servercfgdefault="" +servercfg="LinuxServer-KFGame.ini" +servercfgdefault="LinuxServer-KFGame.ini" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory From aa0207d6f858a842aed919fa6fc4ac2830d533e9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 22:11:34 +0100 Subject: [PATCH 08/57] removed servicename as shouldnt be there --- lgsm/config-default/config-lgsm/bb2server/_default.cfg | 3 --- lgsm/config-default/config-lgsm/bf1942server/_default.cfg | 3 --- lgsm/config-default/config-lgsm/bmdmserver/_default.cfg | 3 --- lgsm/config-default/config-lgsm/bsserver/_default.cfg | 3 --- lgsm/config-default/config-lgsm/ccserver/_default.cfg | 3 --- lgsm/config-default/config-lgsm/coserver/_default.cfg | 3 --- lgsm/config-default/config-lgsm/csczserver/_default.cfg | 3 --- 7 files changed, 21 deletions(-) diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg index 8274647f8..4c036d47e 100644 --- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg @@ -98,9 +98,6 @@ branch="" gamename="BrainBread 2" engine="source" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="bb2-server" - #### Directories #### # Edit with care diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg index 45c637b12..449fa84ac 100644 --- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg @@ -77,9 +77,6 @@ logdays="7" gamename="Battlefield: 1942" engine="refractor" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="bf1942-server" - #### Directories #### # Edit with care diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg index 5c0973bfc..68f813db3 100644 --- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg @@ -98,9 +98,6 @@ branch="" gamename="Black Mesa: Deathmatch" engine="source" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="bmdm-server" - #### Directories #### # Edit with care diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg index fc806f72f..4de2c7cb2 100644 --- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg @@ -97,9 +97,6 @@ branch="" gamename="Blade Symphony" engine="source" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="bs-server" - #### Directories #### # Edit with care diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg index b037479a6..898c48558 100644 --- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg @@ -93,9 +93,6 @@ branch="" gamename="Codename CURE" engine="source" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="cc-server" - #### Directories #### # Edit with care diff --git a/lgsm/config-default/config-lgsm/coserver/_default.cfg b/lgsm/config-default/config-lgsm/coserver/_default.cfg index ce5dbd080..bcae9bffc 100644 --- a/lgsm/config-default/config-lgsm/coserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/coserver/_default.cfg @@ -121,9 +121,6 @@ steampass='password' gamename="Classic Offensive" engine="source" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="co-server" - #### Directories #### # Edit with care diff --git a/lgsm/config-default/config-lgsm/csczserver/_default.cfg b/lgsm/config-default/config-lgsm/csczserver/_default.cfg index 49f13b83a..2741b5974 100644 --- a/lgsm/config-default/config-lgsm/csczserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csczserver/_default.cfg @@ -93,9 +93,6 @@ branch="" gamename="Counter-Strike: Condition Zero" engine="goldsource" -## Service Name | https://github.com/GameServerManagers/LinuxGSM/wiki/Multiple-Servers -servicename="cscz-server" - #### Directories #### # Edit with care From 1ce0c450633f4570c70009437f53d4be2bb8a56e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 22:15:48 +0100 Subject: [PATCH 09/57] servicename for multiserver setup --- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index f4e5bf5b1..c12160fdd 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -101,7 +101,7 @@ engine="unreal3" systemdir="${serverfiles}" executabledir="${systemdir}/Binaries/Win64" executable="./KFGameSteamServer.bin.x86_64" -servercfgdir="${systemdir}/Saved/Config/LinuxServer" +servercfgdir="${systemdir}/Saved/Config/${servicename}" servercfg="LinuxServer-KFGame.ini" servercfgdefault="LinuxServer-KFGame.ini" servercfgfullpath="${servercfgdir}/${servercfg}" From 8f1f376eec497101bf0dadc697e628ec5406bf7a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 22:20:44 +0100 Subject: [PATCH 10/57] corrected config dir --- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index c12160fdd..e64382ad3 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -101,7 +101,7 @@ engine="unreal3" systemdir="${serverfiles}" executabledir="${systemdir}/Binaries/Win64" executable="./KFGameSteamServer.bin.x86_64" -servercfgdir="${systemdir}/Saved/Config/${servicename}" +servercfgdir="${systemdir}/KFGame/Config/${servicename}" servercfg="LinuxServer-KFGame.ini" servercfgdefault="LinuxServer-KFGame.ini" servercfgfullpath="${servercfgdir}/${servercfg}" From e4e8b5fbf3f4f2b5fe620cd2f75aedfe8214ebea Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 11 Sep 2017 22:34:52 +0100 Subject: [PATCH 11/57] added KF2 --- lgsm/functions/info_config.sh | 37 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 5e0c47694..3f1ee7575 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -627,7 +627,21 @@ fn_info_config_unreal3(){ webadminpass="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminpass=$(grep grep "AdminPassword" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + + # Not Set + servername=${servername:-"NOT SET"} + webadminpass=${webadminpass:-"NOT SET"} + fi +} + +fn_info_config_kf2(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + webadminpass="${unavailable}" + else + servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') # Not Set servername=${servername:-"NOT SET"} @@ -804,6 +818,18 @@ elif [ "${engine}" == "dontstarve" ]; then # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_config_factorio +# Killing Floor 2 +elif [ "${gamename}" == "Killing Floor 2" ]; then + fn_info_config_kf2 +# Minecraft +elif [ "${engine}" == "lwjgl2" ]; then + fn_info_config_minecraft +# Project Cars +elif [ "${gamename}" == "Project Cars" ]; then + fn_info_config_projectcars +# Project Zomboid +elif [ "${engine}" == "projectzomboid" ]; then + fn_info_config_projectzomboid # QuakeWorld elif [ "${gamename}" == "QuakeWorld" ]; then fn_info_config_quakeworld @@ -816,15 +842,6 @@ elif [ "${gamename}" == "Quake 3: Arena" ]; then # Quake Live elif [ "${gamename}" == "Quake Live" ]; then fn_info_config_quakelive -# Minecraft -elif [ "${engine}" == "lwjgl2" ]; then - fn_info_config_minecraft -# Project Cars -elif [ "${gamename}" == "Project Cars" ]; then - fn_info_config_projectcars -# Project Zomboid -elif [ "${engine}" == "projectzomboid" ]; then - fn_info_config_projectzomboid # ARMA 3 elif [ "${engine}" == "realvirtuality" ]; then fn_info_config_realvirtuality From a6d09ec696f8c39052916fcdfa308b1ed8a4c9dd Mon Sep 17 00:00:00 2001 From: Doc1337 Date: Wed, 13 Sep 2017 16:45:32 +0200 Subject: [PATCH 12/57] Fix simple bug DarkRP is gamemode, not addon. --- lgsm/functions/mods_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index ef4a5881c..695b28c9d 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -63,7 +63,7 @@ mod_info_uclip=( MOD "uclip" "UClip" "https://github.com/TeamUlysses/uclip/archi mod_info_acf=( MOD "acf" "Armoured Combat Framework" "https://github.com/nrlulz/ACF/archive/master.zip" "acf-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "acf-master/lua/acf/shared/guns;" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/nrlulz/ACF" "Realistic Wepons & Engines" ) mod_info_acf_missiles=( MOD "acfmissiles" "ACF Missiles" "https://github.com/Bubbus/ACF-Missiles/archive/master.zip" "acf-missiles-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Bubbus/ACF-Missiles" "More missiles for ACF" ) mod_info_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/wiremod/advdupe2/archive/master.zip" "advdupe2-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://www.wiremod.com" "Save your constructions" ) -mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" ) +mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/gamemodes" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" ) mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "https://github.com/FPtje/darkrpmodification/archive/master.zip" "darkrpmodification-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "NOUPDATE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Customize DarkRP settings" ) # Oxidemod mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "https://dl.bintray.com/oxidemod/builds/Oxide-Rust.zip" "Oxide-Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" ) From b84bc547131eaf339fb119585bf9a16b01c7e376 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 14:23:52 +0100 Subject: [PATCH 13/57] Moved UT3 Maxplayers to config from parms --- .../config-lgsm/ut3server/_default.cfg | 3 +- lgsm/functions/info_config.sh | 41 ++++++------------- lgsm/functions/info_parms.sh | 1 - 3 files changed, 14 insertions(+), 31 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 26eb9fdaf..ecf8f6a56 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -13,7 +13,6 @@ ip="0.0.0.0" port="7777" queryport="25300" defaultmap="VCTF-Suspense" -maxplayers="32" game="UTGameContent.UTVehicleCTFGame_Content" mutators="" #"UTGame.UTMutator_Instagib,UTGame.UTMutator_LowGrav" isdedicated="true" @@ -26,7 +25,7 @@ allowjoininprogress="true" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters # Edit with care | List of game types and mutators : http://wiki.unrealadmin.org/FAQ:UT3 fn_parms(){ -parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?MaxPlayers=${maxplayers}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}" +parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}" } #### LinuxGSM Settings #### diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 3f1ee7575..2cbbf951f 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -625,27 +625,15 @@ fn_info_config_unreal3(){ if [ ! -f "${servercfgfullpath}" ]; then servername="${unavailable}" webadminpass="${unavailable}" + maxplayers="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - - # Not Set - servername=${servername:-"NOT SET"} - webadminpass=${webadminpass:-"NOT SET"} - fi -} - -fn_info_config_kf2(){ - if [ ! -f "${servercfgfullpath}" ]; then - servername="${unavailable}" - webadminpass="${unavailable}" - else - servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - + webadminpass=$(grep "AdminPassword" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + maxplayers=$(grep "MaxPlayers" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxPlayers//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') # Not Set servername=${servername:-"NOT SET"} webadminpass=${webadminpass:-"NOT SET"} + maxplayers=${maxplayers:-"NOT SET"} fi } @@ -818,18 +806,6 @@ elif [ "${engine}" == "dontstarve" ]; then # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_config_factorio -# Killing Floor 2 -elif [ "${gamename}" == "Killing Floor 2" ]; then - fn_info_config_kf2 -# Minecraft -elif [ "${engine}" == "lwjgl2" ]; then - fn_info_config_minecraft -# Project Cars -elif [ "${gamename}" == "Project Cars" ]; then - fn_info_config_projectcars -# Project Zomboid -elif [ "${engine}" == "projectzomboid" ]; then - fn_info_config_projectzomboid # QuakeWorld elif [ "${gamename}" == "QuakeWorld" ]; then fn_info_config_quakeworld @@ -842,6 +818,15 @@ elif [ "${gamename}" == "Quake 3: Arena" ]; then # Quake Live elif [ "${gamename}" == "Quake Live" ]; then fn_info_config_quakelive +# Minecraft +elif [ "${engine}" == "lwjgl2" ]; then + fn_info_config_minecraft +# Project Cars +elif [ "${gamename}" == "Project Cars" ]; then + fn_info_config_projectcars +# Project Zomboid +elif [ "${engine}" == "projectzomboid" ]; then + fn_info_config_projectzomboid # ARMA 3 elif [ "${engine}" == "realvirtuality" ]; then fn_info_config_realvirtuality diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 72151a0e3..752eae86b 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -112,7 +112,6 @@ fn_info_parms_unreal3(){ port=${port:-"0"} queryport=${queryport:-"0"} defaultmap=${defaultmap:-"NOT SET"} - maxplayers=${maxplayers:-"0"} serverpassword=${serverpassword:-"NOT SET"} adminpassword=${adminpassword:-"NOT SET"} } From 7c393a959d5e4524e380dced39b849f079dd9d5d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 14:29:19 +0100 Subject: [PATCH 14/57] added missing path --- lgsm/functions/info_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 2cbbf951f..012a13b8c 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -628,8 +628,8 @@ fn_info_config_unreal3(){ maxplayers="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminpass=$(grep "AdminPassword" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - maxplayers=$(grep "MaxPlayers" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxPlayers//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxPlayers//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') # Not Set servername=${servername:-"NOT SET"} webadminpass=${webadminpass:-"NOT SET"} From 9ac0d1cfd25a40ee7e414871b367ae95670a6228 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 14:39:02 +0100 Subject: [PATCH 15/57] corrected order --- lgsm/config-default/config-lgsm/qlserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/roserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ss3server/_default.cfg | 2 +- lgsm/config-default/config-lgsm/twserver/_default.cfg | 2 +- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg index b9043a72b..d5e19bc22 100644 --- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg @@ -110,8 +110,8 @@ logdir="${rootdir}/log" gamelogdir="${logdir}/server" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" -lgsmlog="${lgsmlogdir}/${servicename}-script.log" gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" alertlog="${lgsmlogdir}/${servicename}-alert.log" postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index 98d5fb001..8d678f872 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -115,8 +115,8 @@ logdir="${rootdir}/log" gamelogdir="${logdir}/server" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" -lgsmlog="${lgsmlogdir}/${servicename}-script.log" gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" alertlog="${lgsmlogdir}/${servicename}-alert.log" postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg index 5d8b2edbf..d54bd259b 100644 --- a/lgsm/config-default/config-lgsm/ss3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ss3server/_default.cfg @@ -109,8 +109,8 @@ logdir="${rootdir}/log" gamelogdir="${logdir}/server" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" -lgsmlog="${lgsmlogdir}/${servicename}-script.log" gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" alertlog="${lgsmlogdir}/${servicename}-alert.log" postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg index bc13ff3a0..81ee6196b 100644 --- a/lgsm/config-default/config-lgsm/twserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/twserver/_default.cfg @@ -112,8 +112,8 @@ logdir="${rootdir}/log" gamelogdir="${logdir}/server" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" -lgsmlog="${lgsmlogdir}/${servicename}-script.log" gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" alertlog="${lgsmlogdir}/${servicename}-alert.log" postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index ecf8f6a56..4e12b1f72 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -109,14 +109,13 @@ logdir="${rootdir}/log" gamelogdir="${logdir}/server" lgsmlogdir="${logdir}/script" consolelogdir="${logdir}/console" -lgsmlog="${lgsmlogdir}/${servicename}-script.log" gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" consolelog="${consolelogdir}/${servicename}-console.log" alertlog="${lgsmlogdir}/${servicename}-alert.log" postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming - lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log" From 971505e10d795a2956d25bc18080b367bc7ce22d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 14:44:38 +0100 Subject: [PATCH 16/57] added more details to unreal 3 --- lgsm/functions/info_config.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 012a13b8c..968c5afb0 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -624,15 +624,26 @@ fn_info_config_unreal(){ fn_info_config_unreal3(){ if [ ! -f "${servercfgfullpath}" ]; then servername="${unavailable}" + serverpassword="${unavailable}" + adminpassword="${unavailable}" + webadminenabled="${unavailable}" + webadminport="${zero}" webadminpass="${unavailable}" maxplayers="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + # Not in UT3 + serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxPlayers//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminenabled=$(grep "bEnabled" "${servercfgdir}"/* | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep "ListenPort" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') # Not Set servername=${servername:-"NOT SET"} - webadminpass=${webadminpass:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + adminpassword=${adminpassword:-"NOT SET"} + webadminenabled=${webadminenabled:-"NOT SET"} + webadminport=${webadminport:-"0"} maxplayers=${maxplayers:-"NOT SET"} fi } From 66941dd403414174668456ee109f41b8089a5a31 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 14:47:59 +0100 Subject: [PATCH 17/57] maxplayers is now a number --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 968c5afb0..2b878b1fe 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -635,7 +635,7 @@ fn_info_config_unreal3(){ # Not in UT3 serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxPlayers//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') webadminenabled=$(grep "bEnabled" "${servercfgdir}"/* | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') webadminport=$(grep "ListenPort" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') # Not Set From a71bd1d10d91b01222cb3cd038fc07428b731cd1 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 14:59:28 +0100 Subject: [PATCH 18/57] added webadmin details --- lgsm/functions/info_config.sh | 7 ++++--- lgsm/functions/info_messages.sh | 13 +++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 2b878b1fe..2d268511b 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -626,10 +626,10 @@ fn_info_config_unreal3(){ servername="${unavailable}" serverpassword="${unavailable}" adminpassword="${unavailable}" + maxplayers="${unavailable}" webadminenabled="${unavailable}" webadminport="${zero}" webadminpass="${unavailable}" - maxplayers="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') # Not in UT3 @@ -637,14 +637,15 @@ fn_info_config_unreal3(){ adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') webadminenabled=$(grep "bEnabled" "${servercfgdir}"/* | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep "ListenPort" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') + webadminport=$(grep "ListenPort" "${servercfgdir}"/* | grep -v "#" | tr -cd '[:digit:]') # Not Set servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} adminpassword=${adminpassword:-"NOT SET"} + maxplayers=${maxplayers:-"NOT SET"} webadminenabled=${webadminenabled:-"NOT SET"} webadminport=${webadminport:-"0"} - maxplayers=${maxplayers:-"NOT SET"} + fi } diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index c6285233b..39307ff0e 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -862,13 +862,22 @@ fn_info_message_unreal(){ } | column -s $'\t' -t } -fn_info_message_ut3(){ +fn_info_message_unreal3(){ echo -e "netstat -atunp | grep ut3-bin" echo -e "" { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" echo -e "> Game/Query\tINBOUND\t${port}\ttcp/udp" } | column -s $'\t' -t + echo -e "" + echo -e "${lightgreen}${servername} WebAdmin${default}" + fn_messages_separator + { + echo -e "${blue}WebAdmin enabled:\t${default}${webadminenabled}" + echo -e "${blue}WebAdmin url:\t${default}http://${ip}:${webadminport}" + echo -e "${blue}WebAdmin username:\t${default}${webadminuser}" + echo -e "${blue}WebAdmin password:\t${default}${webadminpass}" + } | column -s $'\t' -t } fn_info_message_wolfensteinenemyterritory(){ @@ -924,7 +933,7 @@ fn_info_message_select_engine(){ elif [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then fn_info_message_unreal elif [ "${engine}" == "unreal3" ]; then - fn_info_message_ut3 + fn_info_message_unreal3 elif [ "${gamename}" == "7 Days To Die" ]; then fn_info_message_sdtd elif [ "${gamename}" == "ARK: Survival Evolved" ]; then From f51f37ec408f0665ef389ce9ac25c7ff026dd404 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 15:01:08 +0100 Subject: [PATCH 19/57] added web port --- lgsm/functions/info_messages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 39307ff0e..152ffce81 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -868,6 +868,7 @@ fn_info_message_unreal3(){ { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" echo -e "> Game/Query\tINBOUND\t${port}\ttcp/udp" + echo -e "> WebAdmin\tINBOUND\t${webadminport}\ttcp\tListenPort=${webadminport}" } | column -s $'\t' -t echo -e "" echo -e "${lightgreen}${servername} WebAdmin${default}" From 98c629b107d459cc345859e316d645175a7132bc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 15:02:44 +0100 Subject: [PATCH 20/57] grep filter out file name --- lgsm/functions/info_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 2d268511b..964fd9042 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -636,8 +636,8 @@ fn_info_config_unreal3(){ serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') - webadminenabled=$(grep "bEnabled" "${servercfgdir}"/* | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep "ListenPort" "${servercfgdir}"/* | grep -v "#" | tr -cd '[:digit:]') + webadminenabled=$(grep -oh"bEnabled" "${servercfgdir}"/* | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep -oh "ListenPort" "${servercfgdir}"/* | grep -v "#" | tr -cd '[:digit:]') # Not Set servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} From 0c45328828d485c154eb3cc20e64b075954d58dc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 16:35:30 +0100 Subject: [PATCH 21/57] Added webadmin for ut3 --- lgsm/functions/info_config.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 964fd9042..51c891885 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -629,6 +629,7 @@ fn_info_config_unreal3(){ maxplayers="${unavailable}" webadminenabled="${unavailable}" webadminport="${zero}" + webadminuser="${unavailable}" webadminpass="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') @@ -636,14 +637,19 @@ fn_info_config_unreal3(){ serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') - webadminenabled=$(grep -oh"bEnabled" "${servercfgdir}"/* | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep -oh "ListenPort" "${servercfgdir}"/* | grep -v "#" | tr -cd '[:digit:]') + webadminenabled=$(grep -h "bEnabled" "${servercfgdir}/UTWeb.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep -h "ListenPort" "${servercfgdir}/UTWeb.ini" | grep -v "#" | tr -cd '[:digit:]') + webadminuser="admin" + webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + # Not Set servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} adminpassword=${adminpassword:-"NOT SET"} maxplayers=${maxplayers:-"NOT SET"} webadminenabled=${webadminenabled:-"NOT SET"} + webadminuser=${webadminuser:-"NOT SET"} + webadminpass=${webadminpass:-"NOT SET"} webadminport=${webadminport:-"0"} fi From cd99d741d8abb31fdccf8b6ea7bacb225c4d5369 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 16:46:11 +0100 Subject: [PATCH 22/57] if alteres config name depending on game --- lgsm/functions/info_config.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 51c891885..be3c76be4 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -637,8 +637,13 @@ fn_info_config_unreal3(){ serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') - webadminenabled=$(grep -h "bEnabled" "${servercfgdir}/UTWeb.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep -h "ListenPort" "${servercfgdir}/UTWeb.ini" | grep -v "#" | tr -cd '[:digit:]') + if [ "${shortname}" == "kf2" ]; then + web=KF + else + web=UT + fi + webadminenabled=$(grep -h "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep -h "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') webadminuser="admin" webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') From 13ec2a07822de89297bf2e967f9f084ba84f7a4e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 16:52:32 +0100 Subject: [PATCH 23/57] added KF2 glibc requirements --- lgsm/functions/info_glibc.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 01a9d5ece..a1974e12a 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +F#!/bin/bash # LinuxGSM info_glibc.sh function # Author: Daniel Gibbs # Website: https://gameservermanagers.com @@ -65,6 +65,9 @@ elif [ "${gamename}" == "GoldenEye: Source" ]; then elif [ "${gamename}" == "Insurgency" ]; then glibcrequired="2.15" glibcfix="yes" +elif [ "${shortname}" == "kf2" ]; then + glibcrequired="2.17" + glibcfix="no" elif [ "${gamename}" == "Mumble" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" From 2bd5a9082bd28e53d326895bacd004af25781c24 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 16:59:48 +0100 Subject: [PATCH 24/57] UT3 now uses ConfigSubDir= to better handle configs --- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 4e12b1f72..2187387d2 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -25,7 +25,7 @@ allowjoininprogress="true" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters # Edit with care | List of game types and mutators : http://wiki.unrealadmin.org/FAQ:UT3 fn_parms(){ -parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?Mutator=${mutators} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} -ini=${servercfgfullpath}" +parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?Mutator=${mutators}?ConfigSubDir=${servicename} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} } #### LinuxGSM Settings #### @@ -96,9 +96,9 @@ engine="unreal3" systemdir="${serverfiles}" executabledir="${systemdir}/Binaries" executable="./ut3" -servercfg="${servicename}.ini" +servercfg="UTGame.ini" servercfgdefault="UTGame.ini" -servercfgdir="${systemdir}/UTGame/Config" +servercfgdir="${systemdir}/UTGame/Config/${servicename}" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory From 5887b4d5d107d68760e224fe759c0f9eaf9ab36f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:01:57 +0100 Subject: [PATCH 25/57] missed " --- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 2187387d2..f701b563d 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -25,7 +25,7 @@ allowjoininprogress="true" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters # Edit with care | List of game types and mutators : http://wiki.unrealadmin.org/FAQ:UT3 fn_parms(){ -parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?Mutator=${mutators}?ConfigSubDir=${servicename} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog} +parms="server ${defaultmap}?Game=${game}?bIsDedicated=${isdedicated}?bIsLanMatch=${islanmatch}?bUsesStats=${usesstats}?bShouldAdvertise=${shouldadvertise}?PureServer=${pureserver}?bAllowJoinInProgress=${allowjoininprogress}?Mutator=${mutators}?ConfigSubDir=${servicename} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog}" } #### LinuxGSM Settings #### From 5bd18c20bdef1ba241f9a1d0e7bd78bc4298903c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:13:05 +0100 Subject: [PATCH 26/57] ut3 now checks for cfgdir --- lgsm/functions/install_config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index ff333cdaf..dcd2e0aa5 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -524,6 +524,7 @@ elif [ "${gamename}" == "Unreal Tournament 2004" ]; then fn_set_config_vars elif [ "${gamename}" == "Unreal Tournament 3" ]; then gamedirname="UnrealTournament3" + fn_check_cfgdir array_configs+=( UTGame.ini ) fn_fetch_default_config fn_default_config_remote From 9d8200b44b602da1c48750c6c653fe3ef3f9456f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:15:14 +0100 Subject: [PATCH 27/57] stray letter --- lgsm/functions/info_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index a1974e12a..dca0c6238 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -1,4 +1,4 @@ -F#!/bin/bash +#!/bin/bash # LinuxGSM info_glibc.sh function # Author: Daniel Gibbs # Website: https://gameservermanagers.com From 18415361e59ba4c207a64ca61839015a6ba734b4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:22:05 +0100 Subject: [PATCH 28/57] Added UTWeb.ini to config download --- lgsm/functions/install_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index dcd2e0aa5..5b1b44c6e 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -525,7 +525,7 @@ elif [ "${gamename}" == "Unreal Tournament 2004" ]; then elif [ "${gamename}" == "Unreal Tournament 3" ]; then gamedirname="UnrealTournament3" fn_check_cfgdir - array_configs+=( UTGame.ini ) + array_configs+=( UTGame.ini UTWeb.ini ) fn_fetch_default_config fn_default_config_remote fn_set_config_vars From e123c9beacef1680fece6efd864ff317bccce994 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:31:58 +0100 Subject: [PATCH 29/57] Removed UT3 config download as causes server to fail starting UT3 server sees the dir already exists and then fails to copy all the config to the configdir --- lgsm/functions/install_config.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 5b1b44c6e..cb37c8a30 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -522,13 +522,6 @@ elif [ "${gamename}" == "Unreal Tournament 2004" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars -elif [ "${gamename}" == "Unreal Tournament 3" ]; then - gamedirname="UnrealTournament3" - fn_check_cfgdir - array_configs+=( UTGame.ini UTWeb.ini ) - fn_fetch_default_config - fn_default_config_remote - fn_set_config_vars elif [ "${gamename}" == "Unreal Tournament 99" ]; then gamedirname="UnrealTournament99" array_configs+=( Default.ini ) From dff0ac440de059a768b900e13771247996562025 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:34:49 +0100 Subject: [PATCH 30/57] Removed KF2 config download as causes server to fail starting --- lgsm/functions/install_config.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index cb37c8a30..e342e0e04 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -342,12 +342,6 @@ elif [ "${gamename}" == "Killing Floor" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars -elif [ "${gamename}" == "Killing Floor 2" ]; then - gamedirname="KillingFloor2" - array_configs+=( LinuxServer-KFGame.ini LinuxServer-KFEngine.ini KFWeb.ini ) - fn_fetch_default_config - fn_default_config_remote - fn_set_config_vars elif [ "${gamename}" == "Left 4 Dead" ]; then gamedirname="Left4Dead" array_configs+=( server.cfg ) From 14a493d7c05f0046b4dffcd6a7aefde88386de47 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:41:50 +0100 Subject: [PATCH 31/57] added kf2 info mesage --- lgsm/functions/info_messages.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 152ffce81..1a8bb28c6 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -881,6 +881,25 @@ fn_info_message_unreal3(){ } | column -s $'\t' -t } +fn_info_message_kf2(){ + echo -e "netstat -atunp | grep KFGame" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game/Query\tINBOUND\t${port}\ttcp/udp" + echo -e "> WebAdmin\tINBOUND\t${webadminport}\ttcp\tListenPort=${webadminport}" + } | column -s $'\t' -t + echo -e "" + echo -e "${lightgreen}${servername} WebAdmin${default}" + fn_messages_separator + { + echo -e "${blue}WebAdmin enabled:\t${default}${webadminenabled}" + echo -e "${blue}WebAdmin url:\t${default}http://${ip}:${webadminport}" + echo -e "${blue}WebAdmin username:\t${default}${webadminuser}" + echo -e "${blue}WebAdmin password:\t${default}${webadminpass}" + } | column -s $'\t' -t +} + fn_info_message_wolfensteinenemyterritory(){ echo -e "netstat -atunp | grep etded" echo -e "" @@ -955,6 +974,8 @@ fn_info_message_select_engine(){ fn_info_message_factorio elif [ "${gamename}" == "Hurtworld" ]; then fn_info_message_hurtworld + elif [ "${shortname}" == "kf2" ]; then + fn_info_message_kf2 elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars elif [ "${gamename}" == "QuakeWorld" ]; then From 690f3f3e0426d4678a810289b466e8f7c74e3e91 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 17:41:56 +0100 Subject: [PATCH 32/57] tidy --- lgsm/functions/info_config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index be3c76be4..1a5e1d80a 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -653,9 +653,10 @@ fn_info_config_unreal3(){ adminpassword=${adminpassword:-"NOT SET"} maxplayers=${maxplayers:-"NOT SET"} webadminenabled=${webadminenabled:-"NOT SET"} + webadminport=${webadminport:-"0"} webadminuser=${webadminuser:-"NOT SET"} webadminpass=${webadminpass:-"NOT SET"} - webadminport=${webadminport:-"0"} + fi } From 3e6463f7b07b9b1854542f594d500296f70c8fc4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 20:36:56 +0100 Subject: [PATCH 33/57] Now gets internet IP for servers that are behind NAT --- lgsm/functions/info_distro.sh | 3 +++ lgsm/functions/info_messages.sh | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 0c2c770a3..b2f75b78b 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -133,3 +133,6 @@ if [ -d "${backupdir}" ]; then lastbackupsize=$(du -h "${lastbackup}" | awk '{print $1}') fi fi + +# External IP address +extip=$(curl -m 3 ifconfig.co 2>/dev/null) \ No newline at end of file diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 1a8bb28c6..3c8dd9e1c 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -134,6 +134,13 @@ fn_info_message_gameserver(){ # Server ip echo -e "${blue}Server IP:\t${default}${ip}:${port}" + # External server ip + if [ -n "${extip}" ]; then + if [ "${ip}" != "${extip}"]; then + echo -e "${blue}Internet IP:\t${default}${extip}:${port}" + fi + fi + # Server password if [ -n "${serverpassword}" ]; then echo -e "${blue}Server password:\t${default}${serverpassword}" From 60a57e64180e67fa58e8bcd750d8f47d1a69c537 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 21:22:44 +0100 Subject: [PATCH 34/57] space --- lgsm/functions/info_messages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 3c8dd9e1c..c7bdc468c 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -136,7 +136,7 @@ fn_info_message_gameserver(){ # External server ip if [ -n "${extip}" ]; then - if [ "${ip}" != "${extip}"]; then + if [ "${ip}" != "${extip}" ]; then echo -e "${blue}Internet IP:\t${default}${extip}:${port}" fi fi From 3def9a2d9ee9df122bd9d803f06554584283514e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 21:36:24 +0100 Subject: [PATCH 35/57] gamename should come first --- lgsm/functions/info_messages.sh | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index c7bdc468c..69a5a5469 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -931,37 +931,7 @@ fn_info_message_mta(){ fn_info_message_select_engine(){ # Display details depending on game or engine. - if [ "${engine}" == "avalanche" ]; then - fn_info_message_avalanche - elif [ "${engine}" == "refractor" ]; then - fn_info_message_refractor - elif [ "${engine}" == "dontstarve" ]; then - fn_info_message_dontstarve - elif [ "${engine}" == "goldsource" ]; then - fn_info_message_goldsource - elif [ "${engine}" == "lwjgl2" ]; then - fn_info_message_minecraft - elif [ "${engine}" == "projectzomboid" ]; then - fn_info_message_projectzomboid - elif [ "${engine}" == "realvirtuality" ]; then - fn_info_message_realvirtuality - elif [ "${engine}" == "seriousengine35" ]; then - fn_info_message_seriousengine35 - elif [ "${engine}" == "source" ]; then - fn_info_message_source - elif [ "${engine}" == "spark" ]; then - fn_info_message_spark - elif [ "${engine}" == "starbound" ]; then - fn_info_message_starbound - elif [ "${engine}" == "teeworlds" ]; then - fn_info_message_teeworlds - elif [ "${engine}" == "terraria" ]; then - fn_info_message_terraria - elif [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then - fn_info_message_unreal - elif [ "${engine}" == "unreal3" ]; then - fn_info_message_unreal3 - elif [ "${gamename}" == "7 Days To Die" ]; then + if [ "${gamename}" == "7 Days To Die" ]; then fn_info_message_sdtd elif [ "${gamename}" == "ARK: Survival Evolved" ]; then fn_info_message_ark @@ -1007,6 +977,36 @@ fn_info_message_select_engine(){ fn_info_message_rust elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_info_message_wolfensteinenemyterritory + elif [ "${engine}" == "avalanche" ]; then + fn_info_message_avalanche + elif [ "${engine}" == "refractor" ]; then + fn_info_message_refractor + elif [ "${engine}" == "dontstarve" ]; then + fn_info_message_dontstarve + elif [ "${engine}" == "goldsource" ]; then + fn_info_message_goldsource + elif [ "${engine}" == "lwjgl2" ]; then + fn_info_message_minecraft + elif [ "${engine}" == "projectzomboid" ]; then + fn_info_message_projectzomboid + elif [ "${engine}" == "realvirtuality" ]; then + fn_info_message_realvirtuality + elif [ "${engine}" == "seriousengine35" ]; then + fn_info_message_seriousengine35 + elif [ "${engine}" == "source" ]; then + fn_info_message_source + elif [ "${engine}" == "spark" ]; then + fn_info_message_spark + elif [ "${engine}" == "starbound" ]; then + fn_info_message_starbound + elif [ "${engine}" == "teeworlds" ]; then + fn_info_message_teeworlds + elif [ "${engine}" == "terraria" ]; then + fn_info_message_terraria + elif [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then + fn_info_message_unreal + elif [ "${engine}" == "unreal3" ]; then + fn_info_message_unreal3 else fn_print_error_nl "Unable to detect server engine." fi From bc72c4f6f629e9135f8f439e4e84518c55c3b270 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 21:40:38 +0100 Subject: [PATCH 36/57] Removed MaxPlayers as depends on game mode --- lgsm/functions/info_config.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 1a5e1d80a..39c1d21e6 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -626,7 +626,6 @@ fn_info_config_unreal3(){ servername="${unavailable}" serverpassword="${unavailable}" adminpassword="${unavailable}" - maxplayers="${unavailable}" webadminenabled="${unavailable}" webadminport="${zero}" webadminuser="${unavailable}" @@ -636,7 +635,6 @@ fn_info_config_unreal3(){ # Not in UT3 serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ "${shortname}" == "kf2" ]; then web=KF else @@ -651,7 +649,6 @@ fn_info_config_unreal3(){ servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} adminpassword=${adminpassword:-"NOT SET"} - maxplayers=${maxplayers:-"NOT SET"} webadminenabled=${webadminenabled:-"NOT SET"} webadminport=${webadminport:-"0"} webadminuser=${webadminuser:-"NOT SET"} From 374851129980c933aa10ef717275d39777eef816 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 22:00:02 +0100 Subject: [PATCH 37/57] changed default admin user --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 39c1d21e6..ee188e7d1 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -642,7 +642,7 @@ fn_info_config_unreal3(){ fi webadminenabled=$(grep -h "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') webadminport=$(grep -h "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') - webadminuser="admin" + webadminuser="Admin" webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') # Not Set From 408db1a9f4ca704e7ae177dffdb4a14d3e23fb1f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 22:10:17 +0100 Subject: [PATCH 38/57] added external IP to debug info --- lgsm/functions/command_debug.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index 0ff223a50..29b2ec77f 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -52,6 +52,12 @@ if [ -n "${glibcrequired}" ]; then fi # Server ip echo -e "${blue}Server IP:\t${default}${ip}:${port}" +# External server ip +if [ -n "${extip}" ]; then + if [ "${ip}" != "${extip}" ]; then + echo -e "${blue}Internet IP:\t${default}${extip}:${port}" + fi +fi # Server password if [ -n "${serverpassword}" ]; then echo -e "${blue}Server password:\t${default}${serverpassword}" From a1b61eed75007bbe672b9a5631b709d6888525e5 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 22:44:45 +0100 Subject: [PATCH 39/57] updated parms for kf2 --- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index e64382ad3..5e9c243cd 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -10,17 +10,12 @@ ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters ip="0.0.0.0" -port="7777" queryport="27015" -rconport="27020" -maxplayers="12" -webadminuser="admin" -webadminpass="admin" -webadminport="8080" +defaultmap="KF-BioticsLab" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="\"KF-BurningParis?Game=KFGameContent.KFGameInfo_VersusSurvival?maxplayers=${maxplayers}\"" +parms="\"${defaultmap}?Game=KFGameContent.KFGameInfo_VersusSurvival?ConfigSubDir=${servicename} -QueryPort=${queryport}\"" } #### LinuxGSM Settings #### From c9ba8af7aa16e355385599641746ea80858df84f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 23:09:50 +0100 Subject: [PATCH 40/57] Updated ports for KF2 server --- lgsm/functions/info_messages.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 69a5a5469..1f50f82e0 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -851,9 +851,9 @@ fn_info_message_unreal(){ fi if [ "${appid}" ]; then if [ "${appid}" == "223250" ]; then - echo -e "< Steam\tOUTBOUND\t20610\tudp" + echo -e "< Steam\tINBOUND\t20610\tudp" else - echo -e "< Steam\tOUTBOUND\t20660\tudp" + echo -e "< Steam\tINBOUND\t20660\tudp" fi fi echo -e "> WebAdmin\tINBOUND\t${webadminport}\ttcp\tListenPort=${webadminport}" @@ -893,7 +893,9 @@ fn_info_message_kf2(){ echo -e "" { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" - echo -e "> Game/Query\tINBOUND\t${port}\ttcp/udp" + echo -e "> Game\tINBOUND\t${port}\ttcp" + echo -e "> Query\tINBOUND\t${queryport}\ttcp/udp" + echo -e "> Steam\tINBOUND\t20560\tudp" echo -e "> WebAdmin\tINBOUND\t${webadminport}\ttcp\tListenPort=${webadminport}" } | column -s $'\t' -t echo -e "" From 26067f7572b240a929fdda8db68a2d61119ddd72 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 23:16:45 +0100 Subject: [PATCH 41/57] added kf2 specific parms --- lgsm/functions/info_parms.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 752eae86b..b708ac0e5 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -116,6 +116,11 @@ fn_info_parms_unreal3(){ adminpassword=${adminpassword:-"NOT SET"} } +fn_info_parms_kf2(){ + queryport=${queryport:-"0"} + defaultmap=${defaultmap:-"NOT SET"} +} + # ARK: Survival Evolved if [ "${gamename}" == "ARK: Survival Evolved" ]; then fn_info_parms_ark @@ -128,6 +133,8 @@ elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty: Unit # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_parms_factorio +elif [ "${shortname}" == "kf2" ]; then + fn_info_parms_kf2 # Project Zomboid elif [ "${engine}" == "projectzomboid" ]; then fn_info_parms_projectzomboid From fb17dce7a3f2abe210a80c9c3a1f7c3fb7dde500 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 23:17:05 +0100 Subject: [PATCH 42/57] added port to ut3 --- lgsm/functions/info_config.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index ee188e7d1..8651a0718 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -626,6 +626,7 @@ fn_info_config_unreal3(){ servername="${unavailable}" serverpassword="${unavailable}" adminpassword="${unavailable}" + port="${unavailable}" webadminenabled="${unavailable}" webadminport="${zero}" webadminuser="${unavailable}" @@ -640,8 +641,9 @@ fn_info_config_unreal3(){ else web=UT fi - webadminenabled=$(grep -h "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep -h "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') + port=$(grep "Port" "${servercfgdir}/LinuxServer-KFEngine.ini" | grep -v "#" | tr -cd '[:digit:]') + webadminenabled=$(grep "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') webadminuser="Admin" webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') @@ -649,6 +651,7 @@ fn_info_config_unreal3(){ servername=${servername:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} adminpassword=${adminpassword:-"NOT SET"} + port=${port:-"0"} webadminenabled=${webadminenabled:-"NOT SET"} webadminport=${webadminport:-"0"} webadminuser=${webadminuser:-"NOT SET"} From 43c764c59de3ddc2d0749ec8c06495f3409f06bb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 23:21:21 +0100 Subject: [PATCH 43/57] fixed port displaying all ports --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 8651a0718..7db448a44 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -641,7 +641,7 @@ fn_info_config_unreal3(){ else web=UT fi - port=$(grep "Port" "${servercfgdir}/LinuxServer-KFEngine.ini" | grep -v "#" | tr -cd '[:digit:]') + port=$(grep "Port" "${servercfgdir}/LinuxServer-KFEngine.ini" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') webadminenabled=$(grep "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') webadminport=$(grep "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') webadminuser="Admin" From a12d21df45f693ef7453480d7ad5d2273237583d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Sep 2017 23:43:22 +0100 Subject: [PATCH 44/57] seporated ut3 and kf2 --- lgsm/functions/info_config.sh | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 7db448a44..d4d3b7028 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -661,6 +661,46 @@ fn_info_config_unreal3(){ fi } +fn_info_config_kf2(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + serverpassword="${unavailable}" + adminpassword="${unavailable}" + port="${unavailable}" + webadminenabled="${unavailable}" + webadminport="${zero}" + webadminuser="${unavailable}" + webadminpass="${unavailable}" + else + servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + # Not in UT3 + serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + if [ "${shortname}" == "kf2" ]; then + web=KF + else + web=UT + fi + port=$(grep "Port" "${servercfgdir}/LinuxServer-KFEngine.ini" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') + webadminenabled=$(grep "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') + webadminuser="Admin" + webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + + # Not Set + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + adminpassword=${adminpassword:-"NOT SET"} + port=${port:-"0"} + webadminenabled=${webadminenabled:-"NOT SET"} + webadminport=${webadminport:-"0"} + webadminuser=${webadminuser:-"NOT SET"} + webadminpass=${webadminpass:-"NOT SET"} + + + fi +} + fn_info_config_sdtd(){ if [ ! -f "${servercfgfullpath}" ]; then servername="${unavailable}" @@ -830,6 +870,9 @@ elif [ "${engine}" == "dontstarve" ]; then # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_config_factorio +# Killing Floor 2 +elif [ "${shortname}" == "kf2" ]; then + fn_info_config_kf2 # QuakeWorld elif [ "${gamename}" == "QuakeWorld" ]; then fn_info_config_quakeworld From 310b6cd0a149b911c55094c28e69936b444c6c0b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 18 Sep 2017 20:24:44 +0100 Subject: [PATCH 45/57] tidy up ut2 and kf2 --- lgsm/functions/info_config.sh | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index d4d3b7028..645869985 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -636,14 +636,9 @@ fn_info_config_unreal3(){ # Not in UT3 serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - if [ "${shortname}" == "kf2" ]; then - web=KF - else - web=UT - fi - port=$(grep "Port" "${servercfgdir}/LinuxServer-KFEngine.ini" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') - webadminenabled=$(grep "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') + port=$(grep "Port" "${servercfgdir}/UTEngine.ini" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') + webadminenabled=$(grep "bEnabled" "${servercfgdir}/UTWeb.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep "ListenPort" "${servercfgdir}/UTWeb.ini" | grep -v "#" | tr -cd '[:digit:]') webadminuser="Admin" webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') @@ -676,14 +671,9 @@ fn_info_config_kf2(){ # Not in UT3 serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - if [ "${shortname}" == "kf2" ]; then - web=KF - else - web=UT - fi port=$(grep "Port" "${servercfgdir}/LinuxServer-KFEngine.ini" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') - webadminenabled=$(grep "bEnabled" "${servercfgdir}/${web}Web.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminport=$(grep "ListenPort" "${servercfgdir}/${web}Web.ini" | grep -v "#" | tr -cd '[:digit:]') + webadminenabled=$(grep "bEnabled" "${servercfgdir}/KFWeb.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminport=$(grep "ListenPort" "${servercfgdir}/KFWeb.ini" | grep -v "#" | tr -cd '[:digit:]') webadminuser="Admin" webadminpass=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') From 9ceb61574e73aa9eec1371a0a505fb0043db9af0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 18 Sep 2017 21:13:20 +0100 Subject: [PATCH 46/57] imroving UT3 & KF2 details --- lgsm/functions/info_config.sh | 4 ---- lgsm/functions/info_messages.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 645869985..da6b0a6f4 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -633,8 +633,6 @@ fn_info_config_unreal3(){ webadminpass="${unavailable}" else servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - # Not in UT3 - serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') port=$(grep "Port" "${servercfgdir}/UTEngine.ini" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') webadminenabled=$(grep "bEnabled" "${servercfgdir}/UTWeb.ini" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') @@ -651,8 +649,6 @@ fn_info_config_unreal3(){ webadminport=${webadminport:-"0"} webadminuser=${webadminuser:-"NOT SET"} webadminpass=${webadminpass:-"NOT SET"} - - fi } diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 1f50f82e0..4418f7519 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -382,12 +382,16 @@ fn_info_message_ports(){ local ports_edit_array=( "avalanche" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) for port_edit in "${ports_edit_array[@]}" do - if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then + if [ "${shortname}" == "ut3" ]; then + parmslocation="${servercfgdir}/UTEngine.ini\n${servercfgdir}/UTWeb.ini" + elif [ "${shortname}" == "kf2" ]; then + parmslocation="${servercfgdir}/LinuxServer-KFEngine.ini\n${servercfgdir}/KFWeb.ini" + elif [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then parmslocation="${servercfgfullpath}" fi done # engines/games that require editing in the script file - local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "Rust" "spark" "source" "starbound" "unreal4" "realvirtuality") + local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "Rust" "spark" "source" "starbound" "unreal4" "realvirtuality") for port_edit in "${ports_edit_array[@]}" do if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then From 8410191aba5c29c5c24a62b686da304f48eb9d5a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 18 Sep 2017 21:20:54 +0100 Subject: [PATCH 47/57] ut3 and kf2 bypass config checker --- lgsm/functions/check_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_config.sh b/lgsm/functions/check_config.sh index 7b1ff92cf..bbb8b7054 100644 --- a/lgsm/functions/check_config.sh +++ b/lgsm/functions/check_config.sh @@ -8,7 +8,7 @@ local commandname="CHECK" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" if [ ! -e "${servercfgfullpath}" ]; then - if [ "${gamename}" != "Hurtworld" ]; then + if [ "${gamename}" != "Hurtworld" ]||[ "${shortname}" != "ut3" ]||[ "${shortname}" != "kf2" ]; then fn_print_dots "" sleep 0.5 fn_print_warn_nl "Configuration file missing!" From 18a085a6e4cd5386c5629ff75763d620765355d1 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 21 Sep 2017 18:07:26 +0100 Subject: [PATCH 48/57] Added all alert types to details --- lgsm/functions/info_messages.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 4418f7519..87b62f64e 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -289,12 +289,20 @@ fn_info_message_script(){ fi fi + # Discord alert + echo -e "${blue}Discord alert:\t${default}${discordalert}" # Email alert echo -e "${blue}Email alert:\t${default}${emailalert}" - # Pushbullet alert echo -e "${blue}Pushbullet alert:\t${default}${pushbulletalert}" - + # IFTTT alert + echo -e "${blue}IFTTT alert:\t${default}${iftttalert}" + # Mailgun alert + echo -e "${blue}Mailgun (email) alert:\t${default}${mailgunalert}" + # Pushover alert + echo -e "${blue}Pushover alert:\t${default}${pushoveralert}" + # Telegram alert + echo -e "${blue}Telegram alert:\t${default}${telegramalert}" # Update on start if [ -n "${updateonstart}" ]; then echo -e "${blue}Update on start:\t${default}${updateonstart}" From 2cdda1802086be7d401ba4f47a55eb886919fd27 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 21 Sep 2017 18:14:01 +0100 Subject: [PATCH 49/57] fixes #1308 as per @cedarlugs suggestion --- lgsm/functions/install_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index e342e0e04..65c1c9cf5 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -50,7 +50,7 @@ fn_default_config_remote(){ # PASSWORD to random password fn_set_config_vars(){ if [ -f "${servercfgfullpath}" ]; then - random=$(strings /dev/urandom | grep -o '[[:alnum:]]' | head -n 8 | tr -d '\n'; echo) + random=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 8 | xargs) servername="LinuxGSM" rconpass="admin$random" echo "changing hostname." @@ -82,7 +82,7 @@ fn_set_dst_config_vars(){ sleep 1 echo "randomizing cluster key." fn_script_log_info "randomizing cluster key." - randomkey=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) + randomkey=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 8 | xargs) sed -i "s/CLUSTERKEY/${randomkey}/g" "${clustercfgfullpath}" sleep 1 else From 19a3d31763e2dd7bb1155dca882f8d8ba64fe5c8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 21 Sep 2017 18:20:22 +0100 Subject: [PATCH 50/57] fixed typo that says install instead of remove --- lgsm/functions/command_mods_remove.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_mods_remove.sh b/lgsm/functions/command_mods_remove.sh index 87a83f758..e2176fe18 100644 --- a/lgsm/functions/command_mods_remove.sh +++ b/lgsm/functions/command_mods_remove.sh @@ -32,7 +32,7 @@ done echo "" # Keep prompting as long as the user input doesn't correspond to an available mod while [[ ! " ${installedmodslist[@]} " =~ " ${usermodselect} " ]]; do - echo -en "Enter an ${cyan}addon/mod${default} to ${green}install${default} (or exit to abort): " + echo -en "Enter an ${cyan}addon/mod${default} to ${red}remove${default} (or exit to abort): " read -r usermodselect # Exit if user says exit or abort if [ "${usermodselect}" == "exit" ]||[ "${usermodselect}" == "abort" ]; then From 70be3e17eda0fa124068ce3c9db42bcba21d15c4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 21 Sep 2017 18:36:26 +0100 Subject: [PATCH 51/57] fix for #1315 by unsetting the updateonstart var --- lgsm/functions/command_start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index 44b705082..fec2dd946 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -191,6 +191,7 @@ logs.sh if [ "${status}" == "0" ]; then if [ "${updateonstart}" == "yes" ]||[ "${updateonstart}" == "1" ]||[ "${updateonstart}" == "on" ]; then exitbypass=1 + unset updateonstart command_update.sh fi fi From 3aa9cb18d278fbf198b8e3bf36ba2f63c9818bf0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 21 Sep 2017 22:43:02 +0100 Subject: [PATCH 52/57] added gperftools-libs.i686/libtcmalloc-minimal4:i386 to tf2 deps --- lgsm/functions/check_deps.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 1635b65c4..607cc2f1f 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -183,6 +183,9 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then # Brainbread 2 ,Don't Starve Together & Team Fortress 2 elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]||[ "${gamename}" == "Team Fortress 2" ]; then array_deps_required+=( libcurl4-gnutls-dev:i386 ) + if [ "${gamename}" == "Team Fortress 2" ]; then + array_deps_required+=( libtcmalloc-minimal4:i386 ) + fi # Battlefield: 1942 elif [ "${gamename}" == "Battlefield: 1942" ]; then array_deps_required+=( libncurses5:i386 ) @@ -258,6 +261,9 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then # Brainbread 2, Don't Starve Together & Team Fortress 2 elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]||[ "${gamename}" == "Team Fortress 2" ]; then array_deps_required+=( libcurl.i686 ) + if [ "${gamename}" == "Team Fortress 2" ]; then + array_deps_required+=( gperftools-libs.i686 ) + fi # Battlefield: 1942 elif [ "${gamename}" == "Battlefield: 1942" ]; then array_deps_required+=( ncurses-libs.i686 ) From 659d24700132423f0caf67b60d32ab167cec7bf4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 23 Sep 2017 12:30:38 +0100 Subject: [PATCH 53/57] -nobreakpad option added to fix #1462 --- lgsm/config-default/config-lgsm/csgoserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg index c6775eb53..70eb7ed2b 100644 --- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg @@ -41,7 +41,7 @@ ws_start_map="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}" +parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey} -nobreakpad" } #### LinuxGSM Settings #### From 0856211aa9c2a8efb3ed29c0ea891127b227adb4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 23 Sep 2017 13:24:41 +0100 Subject: [PATCH 54/57] Added requirement for xz to decompress tar.xz #1579 --- lgsm/functions/check_deps.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 607cc2f1f..c022352a7 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -192,6 +192,9 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then # Call of Duty elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty 2" ]; then array_deps_required+=( libstdc++5:i386 ) + # Factorio + elif [ "${gamename}" == "Factorio" ]; then + array_deps_required+=( xz-utils ) # Project Zomboid and Minecraft elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then javaversion=$(java -version 2>&1 | grep "version") @@ -270,6 +273,9 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then # Call of Duty elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty 2" ]; then array_deps_required+=( compat-libstdc++-33.i686 ) + # Factorio + elif [ "${gamename}" == "Factorio" ]; then + array_deps_required+=( xz ) # Project Zomboid and Minecraft elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then javaversion=$(java -version 2>&1 | grep "version") From ae9ff1a489e5040b895d952722cab18218ef18d0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 23 Sep 2017 16:34:10 +0100 Subject: [PATCH 55/57] Adding Zombie Panic! Source --- .../config-lgsm/zpsserver/_default.cfg | 128 ++++++++++++++++ lgsm/data/serverlist.csv | 141 +++++++++--------- 2 files changed, 199 insertions(+), 70 deletions(-) create mode 100644 lgsm/config-default/config-lgsm/zpsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg new file mode 100644 index 000000000..b41d28d4d --- /dev/null +++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg @@ -0,0 +1,128 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="27015" +clientport="27005" +sourcetvport="27020" +defaultmap="zps_deadend" +maxplayers="20" + +## Optional: Game Server Login Token +# GSLT can be used for running a public server. +# More info: https://gameservermanagers.com/gslt +gslt="" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="-game zps -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="475370" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Zombie Panic! Source" +engine="source" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/zps" +executabledir="${serverfiles}" +executable="./srcds_run" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}/cfg" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index b38a0233d..2e167a0b4 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -1,70 +1,71 @@ -arma3,arma3server,ARMA 3 -sdtd,sdtdserver,7 Days to Die -ark,arkserver,ARK: Survival Evolved -bo,boserver,Ballistic Overkill -bf1942,bf1942server,Battlefield 1942 -bmdm,bmdmserver,Black Mesa: Deathmatch -bs,bsserver,Blade Symphony -bb2,bb2server,BrainBread 2 -cod,codserver,Call of Duty -cod2,cod2server,Call of Duty 2 -cod4,cod4server,Call of Duty 4 -coduo,coduoserver,Call of Duty: United Offensive -codwaw,codwawserver,Call of Duty: World at War -cc,ccserver,Codename CURE -cs,csserver,Counter-Strike 1.6 -cscz,csczserver,Counter-Strike: Condition Zero -csgo,csgoserver,Counter-Strike: Global Offensive -css,cssserver,Counter-Strike: Source -dod,dodserver,Day of Defeat -dods,dodsserver,Day of Defeat: Source -doi,doiserver,Day of Infamy -dmc,dmcserver,Deathmatch Classic -dst,dstserver,Don't Starve Together -dab,dabserver,Double Action: Boogaloo -em,emserver,Empires Mod -fctr,fctrserver,Factorio -fof,fofserver,Fistful of Frags -gmod,gmodserver,Garrys Mod -ges,gesserver,GoldenEye: Source -hl2dm,hl2dmserver,Half-Life 2: Deathmatch -hldms,hldmsserver,Half-Life Deathmatch: Source -hldm,hldmserver,Half-Life: Deathmatch -hw,hwserver,Hurtworld -ins,insserver,Insurgency -jc2,jc2server,Just Cause 2 -kf,kfserver,Killing Floor -kf2,kf2server,Killing Floor 2 -l4d,l4dserver,Left 4 Dead -l4d2,l4d2server,Left 4 Dead 2 -mc,mcserver,Minecraft -mta,mtaserver,Multi Theft Auto -mumble,mumbleserver,Mumble -ns2,ns2server,Natural Selection 2 -nmrih,nmrihserver,No More Room in Hell -ns2c,ns2cserver,NS2: Combat -opfor,opforserver,Opposing Force -pvkii,pvkiiserver,Pirates Vikings & Knights II -pc,pcserver,Project Cars -pz,pzserver,Project Zomboid -q2,q2server,Quake 2 -q3,q3server,Quake 3: Arena -ql,qlserver,Quake Live -qw,qwserver,Quake World -ro,roserver,Red Orchestra: Ostfront 41-45 -ricochet,ricochetserver,Ricochet -rust,rustserver,Rust -ss3,ss3server,Serious Sam 3: BFE -sb,sbserver,Starbound -squad,squadserver,Squad -sven,svenserver,Sven Co-op -tf2,tf2server,Team Fortress 2 -tfc,tfcserver,Team Fortress Classic -ts3,ts3server,Teamspeak 3 -tw,twserver,Teeworlds -terraria,terrariaserver,Terraria -tu,tuserver,Tower Unite -ut2k4,ut2k4server,Unreal Tournament 2004 -ut3,ut3server,Unreal Tournament 3 -ut99,ut99server,Unreal Tournament 99 -wet,wetserver,Wolfenstein: Enemy Territory +arma3 arma3server ARMA 3 +sdtd sdtdserver 7 Days to Die +ark arkserver ARK: Survival Evolved +bo boserver Ballistic Overkill +bf1942 bf1942server Battlefield 1942 +bmdm bmdmserver Black Mesa: Deathmatch +bs bsserver Blade Symphony +bb2 bb2server BrainBread 2 +cod codserver Call of Duty +cod2 cod2server Call of Duty 2 +cod4 cod4server Call of Duty 4 +coduo coduoserver Call of Duty: United Offensive +codwaw codwawserver Call of Duty: World at War +cc ccserver Codename CURE +cs csserver Counter-Strike 1.6 +cscz csczserver Counter-Strike: Condition Zero +csgo csgoserver Counter-Strike: Global Offensive +css cssserver Counter-Strike: Source +dod dodserver Day of Defeat +dods dodsserver Day of Defeat: Source +doi doiserver Day of Infamy +dmc dmcserver Deathmatch Classic +dst dstserver Don't Starve Together +dab dabserver Double Action: Boogaloo +em emserver Empires Mod +fctr fctrserver Factorio +fof fofserver Fistful of Frags +gmod gmodserver Garrys Mod +ges gesserver GoldenEye: Source +hl2dm hl2dmserver Half-Life 2: Deathmatch +hldms hldmsserver Half-Life Deathmatch: Source +hldm hldmserver Half-Life: Deathmatch +hw hwserver Hurtworld +ins insserver Insurgency +jc2 jc2server Just Cause 2 +kf kfserver Killing Floor +kf2 kf2server Killing Floor 2 +l4d l4dserver Left 4 Dead +l4d2 l4d2server Left 4 Dead 2 +mc mcserver Minecraft +mta mtaserver Multi Theft Auto +mumble mumbleserver Mumble +ns2 ns2server Natural Selection 2 +nmrih nmrihserver No More Room in Hell +ns2c ns2cserver NS2: Combat +opfor opforserver Opposing Force +pvkii pvkiiserver Pirates Vikings & Knights II +pc pcserver Project Cars +pz pzserver Project Zomboid +q2 q2server Quake 2 +q3 q3server Quake 3: Arena +ql qlserver Quake Live +qw qwserver Quake World +ro roserver Red Orchestra: Ostfront 41-45 +ricochet ricochetserver Ricochet +rust rustserver Rust +ss3 ss3server Serious Sam 3: BFE +sb sbserver Starbound +squad squadserver Squad +sven svenserver Sven Co-op +tf2 tf2server Team Fortress 2 +tfc tfcserver Team Fortress Classic +ts3 ts3server Teamspeak 3 +tw twserver Teeworlds +terraria terrariaserver Terraria +tu tuserver Tower Unite +ut2k4 ut2k4server Unreal Tournament 2004 +ut3 ut3server Unreal Tournament 3 +ut99 ut99server Unreal Tournament 99 +wet wetserver Wolfenstein: Enemy Territory +zps zpsserver Zombie Panic! Source From d230b047c4f0ce90f20bcb9ffe875e97202d79ac Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 23 Sep 2017 16:55:24 +0100 Subject: [PATCH 56/57] corrected appid --- lgsm/config-default/config-lgsm/zpsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg index b41d28d4d..cb36c22a5 100644 --- a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg @@ -87,7 +87,7 @@ logdays="7" ## SteamCMD Settings # Server appid -appid="475370" +appid="17505" # Steam App Branch Select # Allows to opt into the various Steam app branches. Default branch is "". # Example: "-beta latest_experimental" From 49bfeeab7b5264ced5480a50555ad9c8e77f1d29 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 26 Sep 2017 20:45:55 +0100 Subject: [PATCH 57/57] release 170926 --- linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 378980070..da94afcde 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="170803" +version="170926" shortname="core" gameservername="core" rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"