From 8bcfc7ee7faeff9a6f478bd2c0daf162a5318372 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 6 Feb 2021 22:50:35 +0000 Subject: [PATCH 1/5] fix(vhserver): update start parameters for multi word server names aaa --- lgsm/config-default/config-lgsm/vhserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/vhserver/_default.cfg b/lgsm/config-default/config-lgsm/vhserver/_default.cfg index d6e839c370..e0d16319a9 100644 --- a/lgsm/config-default/config-lgsm/vhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vhserver/_default.cfg @@ -16,7 +16,7 @@ gameworld="${selfname}" public="1" ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters -startparameters="-name ${servername} -password ${serverpassword} -port ${port} -world ${gameworld} -public ${public}" +startparameters="-name '${servername}' -password ${serverpassword} -port ${port} -world ${gameworld} -public ${public}" #### LinuxGSM Settings #### From ab4fc0521875a8b2e46542643d646c0f090eca7b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 6 Feb 2021 21:58:18 +0000 Subject: [PATCH 2/5] feat(vhserver): add server query add query port to details correct inbound direction --- lgsm/config-default/config-lgsm/vhserver/_default.cfg | 4 ++-- lgsm/functions/info_messages.sh | 5 +++-- lgsm/functions/info_parms.sh | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lgsm/config-default/config-lgsm/vhserver/_default.cfg b/lgsm/config-default/config-lgsm/vhserver/_default.cfg index e0d16319a9..a8baa0dd63 100644 --- a/lgsm/config-default/config-lgsm/vhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vhserver/_default.cfg @@ -138,8 +138,8 @@ stopmode="2" # 3: gamedig # 4: gsquery # 5: tcp -querymode="1" -querytype="" +querymode="2" +querytype="protocol-valve" ## Console type consoleverbose="yes" diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 90aba09dcf..610952a03b 100755 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1259,9 +1259,9 @@ fn_info_message_unreal(){ fi if [ "${appid}" ]; then if [ "${appid}" == "223250" ]; then - echo -e "< Steam\tINBOUND\t20610\tudp" + echo -e "> Steam\tINBOUND\t20610\tudp" else - echo -e "< Steam\tINBOUND\t20660\tudp" + echo -e "> Steam\tINBOUND\t20660\tudp" fi fi echo -e "> Web Admin\tINBOUND\t${webadminport}\ttcp\tListenPort=${webadminport}" @@ -1347,6 +1347,7 @@ fn_info_message_vh(){ { echo -e "${lightblue}DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL${default}" echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> Query\tINBOUND\t${queryport}\tudp" } | column -s $'\t' -t } diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 7644b03a79..f5533717ff 100755 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -235,6 +235,14 @@ fn_info_parms_ut(){ port=${port:-"0"} } +fn_info_parms_vh(){ + port=${port:-"0"} + queryport=$((port + 1)) + gameworld=${gameworld:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + servername=${servername:-"NOT SET"} +} + fn_info_parms_wf(){ port=${port:-"0"} queryport="${port:-"0"}" @@ -293,6 +301,8 @@ elif [ "${shortname}" == "tu" ]; then fn_info_parms_towerunite elif [ "${shortname}" == "tw" ]; then fn_info_parms_teeworlds +elif [ "${shortname}" == "vh" ]; then + fn_info_parms_vh elif [ "${shortname}" == "mh" ]; then fn_info_parms_mordhau elif [ "${shortname}" == "mta" ]; then From c743e2017d87fe2bdf133b88e6ec1594cc07b670 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 7 Feb 2021 23:03:03 +0100 Subject: [PATCH 3/5] feat(vhserver): add hint to valheim password length (#3216) * Add hint to valheim password length Add hint to default config file. If password is shorten than 5 characters the server did not start. --- lgsm/config-default/config-lgsm/vhserver/_default.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/config-default/config-lgsm/vhserver/_default.cfg b/lgsm/config-default/config-lgsm/vhserver/_default.cfg index a8baa0dd63..c6f8b87262 100644 --- a/lgsm/config-default/config-lgsm/vhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vhserver/_default.cfg @@ -10,6 +10,7 @@ ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters servername="Valheim Server" +# Minimum password length is 5. serverpassword="" port="2456" gameworld="${selfname}" From 5752fc359bf90ea3fb6fe217c979c49af5dceedc Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 8 Feb 2021 00:34:21 +0100 Subject: [PATCH 4/5] fix(core): allow the override of the executeable via common or instance config (#3218) --- linuxgsm.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 2089e38663..c18744871b 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -452,7 +452,6 @@ else eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")" - eval executable="$(sed -nr 's/^ *executable=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi # Load the linuxgsm.sh in to tmpdir. If missing download it. From 32320a6a03346a01f0482995c1c8dcc8d91c4186 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 7 Feb 2021 23:36:57 +0000 Subject: [PATCH 5/5] Release v21.1.3 --- lgsm/functions/core_functions.sh | 2 +- linuxgsm.sh | 2 +- tests/tests_fctrserver.sh | 2 +- tests/tests_jc2server.sh | 2 +- tests/tests_mcserver.sh | 2 +- tests/tests_ts3server.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index a8e9dc03c4..c2e17116c9 100755 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -8,7 +8,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -modulesversion="v21.1.2" +modulesversion="v21.1.3" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index c18744871b..e22fa3ea48 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="core" gameservername="core" commandname="CORE" diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index f522e2c849..46d285e8c5 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="fctr" gameservername="fctrserver" commandname="CORE" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 24d3190cde..1e500759fa 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="jc2" gameservername="jc2server" commandname="CORE" diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index 0546931738..7bd70baf89 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="mc" gameservername="mcserver" commandname="CORE" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index abbf6d737f..394186c650 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.1.2" +version="v21.1.3" shortname="ts3" gameservername="ts3server" commandname="CORE"