Hotfix v21.2.3 (#3418)

* fix(arma3): increase glibc requirement to 2.27 (#3408) * fix(alert): correct discord avatar from png to jpg (#3410) * fix(rust): increase rust query delay (#3412) 5 mins is not enough for some servers to load and query to become available * feat(mcbserver): gamedig is now supported (#3389) Make sure gamedig is updated * feat(etl): update ET: Legacy to 2.77.1 (#3417) * fix(rust): resolve rust seed not loading to server (#3407) * Release v21.2.3 * feat(wipe): resolve random seed and simplify wipe (#3420) merge merge merge merge merge merge MERGE merge merge merge merge message about Rust+ data merge merge merge merge merge mertge merge merge merge merge merge merge Co-authored-by: jobhh <[email protected]>
GameServerManagers · Apr 6, 2021 · facb8b1 · facb8b1
2 parents 532443e + 079ec1e
commit facb8b1
Show file tree

Hide file tree

Showing 26 changed files with 205 additions and 213 deletions.
diff --git a/lgsm/config-default/config-lgsm/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg
@@ -166,7 +166,7 @@ consoleinteract="no"
 # Do not edit
 gamename="ARMA 3"
 engine="realvirtuality"
-glibc="2.13"
+glibc="2.27"
 
 #### Directories ####
 # Edit with care

diff --git a/lgsm/config-default/config-lgsm/mcbserver/_default.cfg b/lgsm/config-default/config-lgsm/mcbserver/_default.cfg
@@ -122,7 +122,7 @@ stopmode="5"
 # 3: gamedig
 # 4: gsquery
 # 5: tcp
-querymode="4"
+querymode="2"
 querytype="minecraftbe"
 
 ## Console type

diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
@@ -16,16 +16,18 @@ appport=28082
 rconpassword="CHANGE_ME"
 rconweb="1" # Value is: 1 for the Facepunch web panel, Rustadmin desktop and Rustadmin Online; 0 for RCON tools like Rusty.
 servername="Rust"
-gamemode="vanilla" # values: vanilla, softcore ( Doc: https://wiki.facepunch.com/rust/server-gamemodes )
-maxplayers="50"
+gamemode="vanilla" # Values: vanilla, softcore ( Doc: https://wiki.facepunch.com/rust/server-gamemodes )
+serverlevel="Procedural Map" # Values: Procedural Map, Barren, HapisIsland, SavasIsland
+customlevelurl="" # Custom level url
 seed="" # range: 1-2147483647, used to reproduce a procedural map.
 salt="" # range: unknown, used to recover a known setting from an existing map.
+maxplayers="50"
 worldsize="3000" # default: 3000, range: 1000-6000, map size in meters.
 saveinterval="300" # Auto-save in seconds.
 tickrate="30" # default: 30, range: 15-100.
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-batchmode +app.listenip ${ip} +app.port ${appport} +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${selfname}\" +server.gamemode ${gamemode} +server.seed ${seed} +server.salt ${salt} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile"
+startparameters="-batchmode +app.listenip ${ip} +app.port ${appport} +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${selfname}\" +server.gamemode ${gamemode} +server.level \"${serverlevel}\" +server.seed ${seed} +server.salt ${salt} +server.levelurl ${customlevelurl} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile"
 
 #### LinuxGSM Settings ####
 
@@ -108,7 +110,7 @@ logdays="7"
 
 ## Monitor | https://docs.linuxgsm.com/commands/monitor
 # Query delay time
-querydelay="5"
+querydelay="10"
 
 ## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
 ansi="on"

diff --git a/lgsm/data/bo_header.jpg b/lgsm/data/bo_header.jpg
diff --git a/lgsm/data/rust_header.jpg b/lgsm/data/rust_header.jpg
diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
@@ -15,13 +15,13 @@ fi
 json=$(cat <<EOF
 {
 	"username":"LinuxGSM",
-	"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png",
+	"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
 	"file":"content",
 	"embeds": [{
 		"color": "2067276",
 		"author": {
 			"name": "${alertemoji} ${alertsubject} ${alertemoji}",
-			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"
+			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
 		},
 		"title": "${servername}",
 		"description": "${alertbody} \n More info: ${alerturl}",

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
@@ -350,7 +350,7 @@ fn_deps_build_debian(){
 	if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${shortname}" != "pmc" ]&&[ "${shortname}" != "wmc" ]&&[ "${engine}" != "renderware" ]; then
 		if [ "${arch}" == "x86_64" ]; then
 			# lib32gcc1 is now called lib32gcc-s1 in debian 11
-			if { [ "${distroid}" == "debian" ]&&[ "${distroversion}" == "11" ]; }|| { [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; } ||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }; then
+			if { [ "${distroid}" == "debian" ]&&[ "${distroversion}" == "11" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }; then
 				array_deps_required+=( lib32gcc-s1 lib32stdc++6 )
 			else
 				array_deps_required+=( lib32gcc1 lib32stdc++6 )

diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh
@@ -67,6 +67,8 @@ fi
 if [ "${serverpassword}" ]; then
 	echo -e "${lightblue}Server password:\t${default}${serverpassword}"
 fi
+
+fn_reload_startparameters
 echo -e "${lightblue}Start parameters:${default}"
 if [ "${engine}" == "source" ]||[ "${engine}" == "goldsrc" ]; then
 	echo -e "${executable} ${startparameters} -debug"

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
@@ -71,6 +71,7 @@ fn_start_tmux(){
 	date '+%s' > "${lockdir}/${selfname}.lock"
 	echo "${version}" >> "${lockdir}/${selfname}.lock"
 	echo "${port}" >> "${lockdir}/${selfname}.lock"
+	fn_reload_startparameters
 	cd "${executabledir}" || exit
 	tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"