feat(newserver): Warfork (#2535)

* feat(newserver): warfork (#2475)

* feat(newserver): warfork (#2508)

* fixing player numbers bug

* gamepid bug

* add qfustion engine

* Update info_messages.sh

* Added missing slack settings

* removed tab

lgsm/config-default/config-lgsm/ahl2server/_default.cfg

@@ -42,6 +42,10 @@ posttarget="https://hastebin.com"
 discordalert="off"
 discordwebhook="webhook"
 
+# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
+slackalert="off"
+slackwebhook="webhook"
+
 # Email Alerts | https://docs.linuxgsm.com/alerts/email
 emailalert="off"
 email="email@example.com"

lgsm/config-default/config-lgsm/etlserver/_default.cfg

@@ -10,7 +10,7 @@
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-	parms="+set net_strict 1 +set fs_homepath ${serverfiles} +exec ${servercfg}"
+parms="+set net_strict 1 +set fs_homepath ${serverfiles} +exec ${servercfg}"
 }
 
 #### LinuxGSM Settings ####

lgsm/config-default/config-lgsm/wfserver/_default.cfg

@@ -0,0 +1,153 @@
+##################################
+######## 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://docs.linuxgsm.com/configuration/start-parameters
+ip="0.0.0.0"
+port="44400"
+httpport="44444"
+
+## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+fn_parms(){
+parms="+exec ${servercfg} +sv_http_ip ${ip} +set sv_http_port ${httpport} +sv_ip ${ip} +sv_port ${port}"
+}
+
+#### LinuxGSM Settings ####
+
+## Notification Alerts
+# (on|off)
+
+# Display IP | https://docs.linuxgsm.com/alerts#display-ip
+displayip=""
+
+# More info | https://docs.linuxgsm.com/alerts#more-info
+postalert="off"
+postdays="7"
+posttarget="https://hastebin.com"
+
+# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
+discordalert="off"
+discordwebhook="webhook"
+
+# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
+slackalert="off"
+slackwebhook="webhook"
+
+# Email Alerts | https://docs.linuxgsm.com/alerts/email
+emailalert="off"
+email="email@example.com"
+emailfrom=""
+
+# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
+iftttalert="off"
+ifttttoken="accesstoken"
+iftttevent="linuxgsm_alert"
+
+# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
+mailgunalert="off"
+mailguntoken="accesstoken"
+mailgundomain="example.com"
+mailgunemailfrom="alert@example.com"
+mailgunemail="email@myemail.com"
+
+# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
+pushoveralert="off"
+pushovertoken="accesstoken"
+
+# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
+# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring".
+# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need
+# any custom string in curl - simple ignore this parameter.
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+curlcustomstring=""
+
+## Backup | https://docs.linuxgsm.com/commands/backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://docs.linuxgsm.com/features/logging
+consolelogging="on"
+logdays="7"
+
+## Monitor | https://docs.linuxgsm.com/commands/monitor
+# Query delay time
+querydelay="1"
+
+#### LinuxGSM Advanced Settings ####
+
+# ANSI Colors
+ansi="on"
+
+# Message Display Time
+sleeptime="0.5"
+
+# Stop Mode | https://docs.linuxgsm.com/steamcmd/stopmode
+# 1: tmux kill
+# 2: CTRL+c
+# 3: quit
+# 4: quit 120s
+# 5: stop
+# 6: q
+# 7: exit
+# 8: 7 Days to Die
+# 9: Gold Source
+# 10: Teamspeak 3
+stopmode="3"
+
+## SteamCMD Settings
+# Server appid
+appid="1136510"
+appidmod="warfork"
+# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
+branch=""
+# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
+steammaster="true"
+
+## LinuxGSM Server Details
+# Do not edit
+gamename="Warfork"
+engine="qfusion"
+glibc="2.15"
+
+#### Directories ####
+# Edit with care
+
+## Server Specific Directories
+systemdir="${serverfiles}/Warfork.app/Contents/Resources"
+executabledir="${systemdir}"
+executable="./wf_server.x86_64"
+servercfg="${servicename}.cfg"
+servercfgdefault="server.cfg"
+servercfgdir="${systemdir}/basewf"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${lgsmdir}/backup"
+
+## Logging Directories
+logdir="${rootdir}/log"
+gamelogdir="${serverfiles}/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"

lgsm/data/serverlist.csv

@@ -94,6 +94,7 @@ ut99,ut99server,Unreal Tournament 99
 unt,untserver,Unturned
 vs,vsserver,Vampire Slayer
 wet,wetserver,Wolfenstein: Enemy Territory
+wf,wfserver,Warfork
 wurm,wurmserver,Wurm Unlimited
 etl,etlserver,ET: Legacy
 zmr,zmrserver,Zombie Master: Reborn

lgsm/functions/command_monitor.sh

@@ -133,7 +133,7 @@ fn_monitor_check_session(){
 fn_monitor_query(){
 	fn_script_log_info "Querying port: query enabled"
 	# Engines that work with query.
-	local allowed_engines_array=( avalanche2.0 avalanche3.0 barotrauma goldsource idtech2 idtech3 idtech3_ql ioquake3 iw2.0 iw3.0 lwjgl2 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 unreal4 wurm )
+	local allowed_engines_array=( avalanche2.0 avalanche3.0 barotrauma goldsource idtech2 idtech3 idtech3_ql ioquake3 iw2.0 iw3.0 lwjgl2 madness quake qfusion refractor realvirtuality source spark starbound unity3d unreal unreal2 unreal4 wurm )
 	for allowed_engine in "${allowed_engines_array[@]}"
 	do
 		if [ "${allowed_engine}" == "${engine}" ]; then

lgsm/functions/info_config.sh

@@ -935,6 +935,24 @@ fn_info_config_unreal3(){
 	fi
 }
 
+
+fn_info_config_warfork(){
+	if [ ! -f "${servercfgfullpath}" ]; then
+		rconpassword="${unavailable}"
+		servername="${unavailable}"
+		maxplayers="${zero}"
+	else
+		rconpassword=$(grep "rcon_password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set rcon_password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		servername=$(grep "sv_hostname" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set sv_hostname//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		maxplayers=$(grep "sv_maxclients" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]')
+
+		# Not Set
+		rconpassword=${rconpassword:-"NOT SET"}
+		servername=${servername:-"NOT SET"}
+		maxplayers=${maxplayers:-"0"}
+	fi
+}
+
 fn_info_config_kf2(){
 	if [ ! -f "${servercfgfullpath}" ]; then
 		servername="${unavailable}"
@@ -1352,6 +1370,8 @@ elif [ "${shortname}" == "sdtd" ]; then
 	fn_info_config_sdtd
 elif [ "${shortname}" == "wet" ]; then
 	fn_info_config_wolfensteinenemyterritory
+elif [ "${shortname}" == "wf" ]; then
+	fn_info_config_warfork
 elif [ "${shortname}" == "etl" ]; then
 	fn_info_config_etlegacy
 elif [ "${shortname}" == "wurm" ]; then

lgsm/functions/info_distro.sh

@@ -141,7 +141,7 @@ if [ -n "$(command -v numfmt 2>/dev/null)" ]; then
 	if [ "${status}" == "1" ]; then
 		memused=$(ps --forest -o rss -g "$(ps -o sid= -p "${gameserverpid}")"|awk '{s+=$1} END {print s}'| awk '{$1/=1024;printf "%.0fMB\t",$1}{print $2}')
 	# %
-		pmemused=$(ps --forest -o %mem -g "$(ps -o sid= -p 2766)"|awk '{s+=$1} END {print s}')
+		pmemused=$(ps --forest -o %mem -g "$(ps -o sid= -p "${gameserverpid}")"|awk '{s+=$1} END {print s}')
 	fi
 else
 # Older distros will need to use free.

lgsm/functions/info_messages.sh

@@ -539,7 +539,7 @@ fn_info_message_ports(){
 
 	parmslocation="${red}UNKNOWN${default}"
 	# engines/games that require editing in the config file
-	local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "Eco" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "Stationeers" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" "wurm" )
+	local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "Eco" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "Stationeers" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" "wurm")
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${shortname}" == "ut3" ]; then
@@ -551,7 +551,7 @@ fn_info_message_ports(){
 		fi
 	done
 	# engines/games that require editing the parms
-	local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "ioquake3" "Rust" "Soldat" "spark" "source" "starbound" "unreal4" "realvirtuality" "Unturned" )
+	local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "ioquake3" "qfusion" "Rust" "Soldat" "spark" "source" "starbound" "unreal4" "realvirtuality" "Unturned" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]||[ "${shortname}" == "${port_edit}" ]; then
@@ -727,6 +727,16 @@ fn_info_message_eco(){
 	} | column -s $'\t' -t
 }
 
+
+fn_info_message_etlegacy(){
+	echo -e "netstat -atunp | grep etlded"
+	echo -e ""
+	{
+		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
+		echo -e "> Game/Query\tINBOUND\t${port}\tudp"
+	} | column -s $'\t' -t
+}
+
 fn_info_message_factorio(){
 	echo -e "netstat -atunp | grep factorio"
 	echo -e ""
@@ -1153,6 +1163,7 @@ fn_info_message_unreal(){
 }
 
 fn_info_message_unreal3(){
+	fn_info_message_password_strip
 	echo -e "netstat -atunp | grep ut3-bin"
 	echo -e ""
 	{
@@ -1182,7 +1193,10 @@ fn_info_message_unturned(){
 	} | column -s $'\t' -t
 }
 
+
+
 fn_info_message_kf2(){
+	fn_info_message_password_strip
 	echo -e "netstat -atunp | grep KFGame"
 	echo -e ""
 	{
@@ -1212,14 +1226,6 @@ fn_info_message_wolfensteinenemyterritory(){
 	} | column -s $'\t' -t
 }
 
-fn_info_message_etlegacy(){
-	echo -e "netstat -atunp | grep etlded"
-	echo -e ""
-	{
-		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
-		echo -e "> Game/Query\tINBOUND\t${port}\tudp"
-	} | column -s $'\t' -t
-}
 
 fn_info_message_wurmunlimited(){
 	echo -e "netstat -atunp | grep WurmServer"
@@ -1276,6 +1282,16 @@ fn_info_message_soldat() {
 	} | column -s $'\t' -t
 }
 
+fn_info_message_warfork(){
+	echo -e "netstat -atunp | grep wf_server"
+	echo -e ""
+	{
+		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
+		echo -e "> Game\tINBOUND\t${port}\tudp"
+		echo -e "> HTTP\tINBOUND\t${httpport}\ttcp"
+	} | column -s $'\t' -t
+}
+
 fn_info_message_select_engine(){
 	# Display details depending on game or engine.
 	if [ "${shortname}" == "sdtd" ]; then
@@ -1354,6 +1370,8 @@ fn_info_message_select_engine(){
 		fn_info_message_rtcw
 	elif [ "${shortname}" == "rust" ]; then
 		fn_info_message_rust
+	elif [ "${shortname}" == "wf" ]; then
+		fn_info_message_warfork
 	elif [ "${shortname}" == "wurm" ]; then
 		fn_info_message_wurmunlimited
 	elif [ "${shortname}" == "rw" ]; then

lgsm/functions/info_parms.sh

@@ -27,11 +27,6 @@ fn_info_parms_barotrauma(){
 	queryport=${queryport:-"0"}
 }
 
-fn_info_parms_realvirtuality(){
-	port=${port:-"0"}
-	queryport=$((port + 1))
-}
-
 fn_info_parms_cod(){
 	defaultmap=${defaultmap:-"NOT SET"}
 	maxplayers=${maxplayers:-"0"}
@@ -57,6 +52,15 @@ fn_info_parms_factorio(){
 	rconpassword=${rconpassword:-"NOT SET"}
 }
 
+fn_info_parms_hurtworld(){
+	servername=${servername:-"NOT SET"}
+	port=${port:-"0"}
+	queryport=${queryport:-"0"}
+	maxplayers=${maxplayers:-"0"}
+	defaultmap=${defaultmap:-"NOT SET"}
+	creativemode=${creativemode:-"NOT SET"}
+}
+
 fn_info_parms_inss(){
 	port=${port:-"0"}
 	queryport=${queryport:-"0"}
@@ -67,13 +71,16 @@ fn_info_parms_inss(){
 	maxplayers=${maxplayers:-"0"}
 }
 
-fn_info_parms_hurtworld(){
-	servername=${servername:-"NOT SET"}
-	port=${port:-"0"}
+fn_info_parms_kf2(){
 	queryport=${queryport:-"0"}
-	maxplayers=${maxplayers:-"0"}
 	defaultmap=${defaultmap:-"NOT SET"}
-	creativemode=${creativemode:-"NOT SET"}
+}
+
+
+fn_info_parms_mordhau(){
+	port=${port:-"0"}
+	queryport=${queryport:-"0"}
+	beaconport=${beaconport:-"0"}
 }
 
 fn_info_parms_projectzomboid(){
@@ -90,12 +97,16 @@ fn_info_parms_quake2(){
 	defaultmap=${defaultmap:-"NOT SET"}
 }
 
+fn_info_parms_realvirtuality(){
+	port=${port:-"0"}
+	queryport=$((port + 1))
+}
+
 fn_info_parms_risingworld(){
 	servername=${servername:-"NOT SET"}
 	port=${port:-"0"}
 	queryport=${port}
 	httpqueryport=$((port - 1))
-
 }
 
 fn_info_parms_rtcw(){
@@ -171,12 +182,6 @@ fn_info_parms_towerunite(){
 	queryport=${queryport:-"0"}
 }
 
-fn_info_parms_mordhau(){
-	port=${port:-"0"}
-	queryport=${queryport:-"0"}
-	beaconport=${beaconport:-"0"}
-}
-
 fn_info_parms_unreal(){
 	defaultmap=${defaultmap:-"NOT SET"}
 	queryport=$((port + 1))
@@ -200,9 +205,11 @@ fn_info_parms_unturned(){
 	port=${port:-"0"}
 	queryport=$((port + 1))
 }
-fn_info_parms_kf2(){
-	queryport=${queryport:-"0"}
-	defaultmap=${defaultmap:-"NOT SET"}
+
+fn_info_parms_wf(){
+	port=${port:-"0"}
+	queryport="${port}"
+	webadminport=${webadminport:-"0"}
 }
 
 # ARK: Survival Evolved
@@ -270,4 +277,7 @@ elif [ "${engine}" == "unreal3" ]; then
 	fn_info_parms_unreal3
 elif [ "${shortname}" == "unt" ]; then
 	fn_info_parms_unturned
+# Warfork
+elif [ "${shortname}" == "wf" ]; then
+	fn_info_parms_wf
 fi

lgsm/functions/install_config.sh

@@ -669,6 +669,12 @@ elif [ "${shortname}" == "wet" ]; then
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_set_config_vars
+elif [ "${shortname}" == "wf" ]; then
+	gamedirname="Warfork"
+	array_configs+=( server.cfg )
+	fn_fetch_default_config
+	fn_default_config_remote
+	fn_set_config_vars
 elif [ "${shortname}" == "wurm" ]; then
 	gamedirname="WurmUnlimited"
 	array_configs+=( server.cfg )

lgsm/functions/query_gamedig.sh

@@ -46,7 +46,7 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ];
 			fi
 		done
 
-		local engine_query_array=( idtech3 iw3.0 ioquake3 )
+		local engine_query_array=( idtech3 iw3.0 ioquake3 qfusion )
 		for engine_query in "${engine_query_array[@]}"
 		do
 			if [ "${engine_query}" == "${engine}" ]; then
@@ -101,15 +101,19 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ];
 		fi
 
 		# numplayers.
-		gdplayers=$(echo "${gamedigraw}" | jq -re '.players|length')
+		gdplayers=$(echo "${gamedigraw}" | jq -re '.players')
 		if [ "${gdplayers}" == "null" ]; then
 			unset gdplayers
+		elif [ "${gdplayers}" == "[]" ]; then
+			gdplayers=0
 		fi
 
 		# maxplayers.
-		gdmaxplayers=$(echo "${gamedigraw}" | jq -re '.maxplayers|length')
+		gdmaxplayers=$(echo "${gamedigraw}" | jq -re '.maxplayers')
 		if [ "${gdmaxplayers}" == "null" ]; then
 			unset maxplayers
+		elif [ "${gdmaxplayers}" == "[]" ]; then
+			gdmaxplayers=0
 		fi
 
 		# current map.

lgsm/functions/query_gsquery.py

@@ -18,7 +18,7 @@ class gsquery:
         self.default_buffer_length = 1024
         #
         sourcequery=[ 'avalanche3.0','barotrauma''madness','quakelive','realvirtuality','refractor','source','goldsource','spark','starbound','unity3d', 'unreal4', 'wurm' ]
-        idtech3query=['idtech3','iw3.0','ioquake3']
+        idtech3query=['idtech3','iw3.0','ioquake3','qfusion']
         idtech2query=['idtech2','quake','iw2.0']
         minecraftquery=['minecraft','lwjgl2']
         if self.option.engine in sourcequery: