Quellcode durchsuchen

fix(ti): Update config using evrima branch (#4263)

* refactor: simplify start parameters in tiserver config

The start parameters in the tiserver config file have been simplified to only include the default map and port. The unnecessary queryport and eaclaunch parameters have been removed.

* refactor: update default configuration and game info handling

- Set `steammaster` to false in the default configuration file.
- Refactor the game info script to handle changes in the game's ini file structure:
  - Update the key for `queueenabled` to `bQueueEnabled`.
  - Update the key for `rconenabled` to `bRconEnabled`.
  - Add support for retrieving `rconpassword`, `serverpassword`, and `serverpasswordenabled`.
- Modify the message formatting in the info messages script to display queue, RCON, and query ports correctly.
Daniel Gibbs vor 2 Jahren
Ursprung
Commit
db692b2610

+ 5 - 10
lgsm/config-default/config-lgsm/tiserver/_default.cfg

@@ -11,15 +11,10 @@
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
 ip="0.0.0.0"
 port="7777"
 port="7777"
-queryport="27015"
-# Possible maps, see: https://isle.fandom.com/wiki/The_Isle_Server_Settings_and_Configuration#Optional_Maps
-map=""
-
-# EAC start parameters
-eaclaunch="-ini:Engine:[EpicOnlineServices]:DedicatedServerClientId=xyza7891gk5PRo3J7G9puCJGFJjmEguW -ini:Engine:[EpicOnlineServices]:DedicatedServerClientSecret=pKWl6t5i9NJK8gTpVlAxzENZ65P8hYzodV8Dqe5Rlc8"
+defaultmap="/Game/TheIsle/Maps/Game/Isla_Spiro/Isla_Spiro"
 
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${map} -MultiHome=${ip} -Port=${port} -QueryPort=${queryport} -log ${eaclaunch}"
+startparameters="${defaultmap} -Port=${port} -log"
 
 
 #### LinuxGSM Settings ####
 #### LinuxGSM Settings ####
 
 
@@ -125,7 +120,7 @@ steamcmdforcewindows="no"
 branch="evrima"
 branch="evrima"
 betapassword=""
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="true"
+steammaster="false"
 
 
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill
 # 1: tmux kill
@@ -147,8 +142,8 @@ stopmode="2"
 # 3: gamedig
 # 3: gamedig
 # 4: gsquery
 # 4: gsquery
 # 5: tcp
 # 5: tcp
-querymode="2"
-querytype="protocol-valve"
+querymode="1"
+querytype=""
 
 
 ## Console type
 ## Console type
 consoleverbose="yes"
 consoleverbose="yes"

+ 8 - 2
lgsm/modules/info_game.sh

@@ -666,18 +666,24 @@ fn_info_game_stn() {
 fn_info_game_ti() {
 fn_info_game_ti() {
 	if [ -f "${servercfgfullpath}" ]; then
 	if [ -f "${servercfgfullpath}" ]; then
 		fn_info_game_ini "maxplayers" "MaxPlayerCount"
 		fn_info_game_ini "maxplayers" "MaxPlayerCount"
-		fn_info_game_ini "queueenabled" "QueueEnabled"
+		fn_info_game_ini "queueenabled" "bQueueEnabled"
 		fn_info_game_ini "queueport" "QueuePort"
 		fn_info_game_ini "queueport" "QueuePort"
-		fn_info_game_ini "rconenabled" "RconEnabled"
+		fn_info_game_ini "rconenabled" "bRconEnabled"
+		fn_info_game_ini "rconpassword" "RconPassword"
 		fn_info_game_ini "rconport" "RconPort"
 		fn_info_game_ini "rconport" "RconPort"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "servername" "ServerName"
+		fn_info_game_ini "serverpassword" "ServerPassword"
+		fn_info_game_ini "serverpasswordenabled" "bServerPassword"
 	fi
 	fi
 	maxplayers="${maxplayers:-"0"}"
 	maxplayers="${maxplayers:-"0"}"
 	queueenabled="${queueenabled:-"NOT SET"}"
 	queueenabled="${queueenabled:-"NOT SET"}"
 	queueport="${queueport:-"0"}"
 	queueport="${queueport:-"0"}"
 	rconenabled="${rconenabled:-"NOT SET"}"
 	rconenabled="${rconenabled:-"NOT SET"}"
+	rconpassword="${rconpassword:-"NOT SET"}"
 	rconport="${rconport:-"0"}"
 	rconport="${rconport:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	servername="${servername:-"NOT SET"}"
+	serverpassword="${serverpassword:-"NOT SET"}"
+	serverpasswordenabled="${serverpasswordenabled:-"NOT SET"}"
 }
 }
 
 
 # Config Type: ini
 # Config Type: ini

+ 2 - 1
lgsm/modules/info_messages.sh

@@ -1505,7 +1505,8 @@ fn_info_message_ti() {
 	{
 	{
 		fn_port "header"
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Game" port udp
-		fn_port "Query" queryport udp
+		fn_port "Queue" queueport tcp
+		fn_port "RCON" rconport tcp
 	} | column -s $'\t' -t
 	} | column -s $'\t' -t
 }
 }