Explorar el Código

fix(st): update st settings to get it working again

Daniel Gibbs hace 2 años
padre
commit
7d958ea222

+ 5 - 11
lgsm/config-default/config-lgsm/stserver/_default.cfg

@@ -9,18 +9,12 @@
 #### Game Server Settings ####
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
-ip="0.0.0.0"
-maxplayers="10"
-port="27500"
-queryport="27015"
-saveinterval="300"
-servername="LinuxGSM"
 worldname="moon_save"
 worldtype="Moon"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 # Edit with care
-startparameters="-LOADLATEST ${worldname} ${worldtype} -settings ServerName ${servername} StartLocalHost true ServerVisible true ServerMaxPlayers ${maxplayers} GamePort ${port} UpdatePort ${queryport} UPNPEnabled true AutoSave true SaveInterval ${saveinterval}"
+startparameters="-LOADLATEST ${worldname} ${worldtype}"
 
 #### LinuxGSM Settings ####
 
@@ -148,18 +142,18 @@ stopmode="3"
 # 3: gamedig
 # 4: gsquery
 # 5: tcp
-querymode="2"
-querytype="protocol-valve"
+querymode="1"
+querytype=""
 
 ## Console type
 consoleverbose="yes"
-consoleinteract="vo"
+consoleinteract="yes"
 
 ## Game Server Details
 # Do not edit
 gamename="Stationeers"
 engine="unity3d"
-glibc="2.15"
+glibc="2.34"
 
 #### Directories ####
 # Edit with care

+ 1 - 1
lgsm/data/almalinux-8.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/almalinux-9.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/centos-7.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/centos-8.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/centos-9.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/debian-10.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/debian-11.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/debian-12.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl3:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/debian-9.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/rhel-7.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/rhel-8.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/rhel-9.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/rocky-8.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/rocky-9.csv

@@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
 sof2
 sol
 squad
-st
+st,libxml2
 stn
 sven
 terraria

+ 1 - 1
lgsm/data/ubuntu-16.04.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/ubuntu-18.04.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/ubuntu-20.04.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/ubuntu-21.04.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/ubuntu-21.10.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/ubuntu-22.04.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 1 - 1
lgsm/data/ubuntu-23.04.csv

@@ -107,7 +107,7 @@ sfc,libtinfo5:i386
 sof2
 sol
 squad
-st
+st,libxml2-utils
 stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria

+ 15 - 16
lgsm/modules/info_game.sh

@@ -613,30 +613,29 @@ fn_info_game_pz() {
 	worldname="${worldname:-"NOT SET"}"
 }
 
-# Config Type: ini
-# Parameters: true
-# Comment: ; or #
-# Example: SERVERNAME=SERVERNAME
-# Filetype: ini
+# Config Type: xml
+# Comment: <!-- -->
+# Example: <ServerName>SERVERNAME</ServerName>
+# Filetype: xml
 fn_info_game_st() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_ini "maxplayers" "MAXPLAYER"
-		fn_info_game_ini "rconpassword" "RCONPASSWORD"
-		fn_info_game_ini "servername" "SERVERNAME"
-		fn_info_game_ini "serverpassword" "PASSWORD"
+		fn_info_game_xml "adminpassword" "/SettingData/AdminPassword"
+		fn_info_game_xml "maxplayers" "/SettingData/ServerMaxPlayers"
+		fn_info_game_xml "port" "/SettingData/GamePort"
+		fn_info_game_xml "queryport" "/SettingData/UpdatePort"
+		fn_info_game_xml "saveinterval" "/SettingData/SaveInterval"
+		fn_info_game_xml "servername" "/SettingData/ServerName"
+		fn_info_game_xml "serverpassword" "/SettingData/ServerPassword"
 	fi
-	clearinterval="${clearinterval:-"0"}"
-	httpport="${port:-"0"}"
+	adminpassword="${adminpassword:-"NOT SET"}"
 	maxplayers="${maxplayers:-"0"}"
 	port="${port:-"0"}"
 	queryport="${queryport:-"0"}"
-	rconpassword="${rconpassword:-"NOT SET"}"
 	saveinterval="${saveinterval:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
 	worldname="${worldname:-"NOT SET"}"
 	worldtype="${worldtype:-"NOT SET"}"
-
 }
 
 # Config Type: ini
@@ -911,7 +910,7 @@ fn_info_game_bf1942() {
 # Comment: ; or #
 # Example: ServerName=SERVERNAME
 # Filetype: ini
-fn_info_game_ct(){
+fn_info_game_ct() {
 	if [ -f "${servercfgfullpath}" ]; then
 		fn_info_game_ini "configip" "bindAddress"
 		fn_info_game_ini "gamemode" "gameMode"
@@ -1240,7 +1239,7 @@ fn_info_game_hw() {
 	port="${port:-"0"}"
 	queryport="${queryport:-"0"}"
 	maxplayers="${maxplayers:-"0"}"
-  	# #4189 option setting can be blank
+	# #4189 option setting can be blank
 	# defaultmap="${defaultmap:-"NOT SET"}"
 	creativemode="${creativemode:-"NOT SET"}"
 }
@@ -1482,7 +1481,7 @@ fn_info_game_nec() {
 # Comment: ; or #
 # Example: ServerName=SERVERNAME
 # Filetype: ini
-fn_info_game_ohd(){
+fn_info_game_ohd() {
 	if [ -f "${servercfgfullpath}" ]; then
 		fn_info_game_ini rconenabled "bEnabled"
 		fn_info_game_ini rconport "ListenPort"

+ 3 - 10
lgsm/modules/info_messages.sh

@@ -969,7 +969,7 @@ fn_info_message_csgo() {
 	} | column -s $'\t' -t
 }
 
-fn_info_message_ct(){
+fn_info_message_ct() {
 	fn_info_message_password_strip
 	{
 		fn_port "header"
@@ -977,7 +977,7 @@ fn_info_message_ct(){
 	} | column -s $'\t' -t
 }
 
-fn_info_message_dayz(){
+fn_info_message_dayz() {
 	{
 		fn_port "header"
 		fn_port "Game" port udp
@@ -1037,7 +1037,7 @@ fn_info_message_goldsrc() {
 	} | column -s $'\t' -t
 }
 
-fn_info_message_hcu(){
+fn_info_message_hcu() {
 	{
 		fn_port "header"
 		fn_port "Game" port udp
@@ -1504,13 +1504,6 @@ fn_info_message_st() {
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
-		fn_port "Web Interface" httpport tcp
-	} | column -s $'\t' -t
-	echo -e ""
-	echo -e "${lightgreen}${gamename} Web Interface${default}"
-	fn_messages_separator
-	{
-		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
 	} | column -s $'\t' -t
 }
 

+ 1 - 8
lgsm/modules/install_config.sh

@@ -383,7 +383,7 @@ elif [ "${shortname}" == "css" ]; then
 	fn_list_config_locations
 elif [ "${shortname}" == "ct" ]; then
 	gamedirname="Craftopia"
-	array_configs+=( ServerSetting.ini )
+	array_configs+=(ServerSetting.ini)
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_set_config_vars
@@ -791,13 +791,6 @@ elif [ "${shortname}" == "sb" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 	fn_list_config_locations
-elif [ "${shortname}" == "st" ]; then
-	gamedirname="Stationeers"
-	array_configs+=(default.ini)
-	fn_fetch_default_config
-	fn_default_config_remote
-	fn_set_config_vars
-	fn_list_config_locations
 elif [ "${shortname}" == "stn" ]; then
 	gamedirname="SurvivetheNights"
 	array_configs+=(ServerConfig.txt ServerUsers.txt TpPresets.json UserPermissions.json)