Browse Source

http

pull/4200/head
Daniel Gibbs 2 years ago
parent
commit
a402c8713f
  1. 6
      lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
  2. 6
      lgsm/config-default/config-lgsm/ns2server/_default.cfg
  3. 9
      lgsm/modules/command_dev_details.sh
  4. 4
      lgsm/modules/command_dev_query_raw.sh
  5. 56
      lgsm/modules/info_game.sh
  6. 82
      lgsm/modules/info_messages.sh

6
lgsm/config-default/config-lgsm/ns2cserver/_default.cfg

@ -14,8 +14,8 @@ port="27015"
defaultmap="co_core"
maxplayers="24"
servername="LinuxGSM Server"
webinterfaceuser="admin"
webinterfacepass="admin"
httpuser="admin"
httppassword="admin"
httpport="8080"
mods=""
serverpassword=""
@ -24,7 +24,7 @@ serverpassword=""
# -password \"${serverpassword}\"
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
startparameters="-name \"${servername}\" -port ${port} -webinterface -webdomain ${ip} -webuser ${webinterfaceuser} -webpassword \"${webinterfacepass}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
startparameters="-name \"${servername}\" -port ${port} -webinterface -webdomain ${ip} -webuser ${httpuser} -webpassword \"${httppassword}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
#### LinuxGSM Settings ####

6
lgsm/config-default/config-lgsm/ns2server/_default.cfg

@ -14,8 +14,8 @@ port="27015"
defaultmap="ns2_summit"
maxplayers="24"
servername="LinuxGSM Server"
webinterfaceuser="admin"
webinterfacepass="admin"
httpuser="admin"
httppassword="admin"
httpport="8080"
mods=""
serverpassword=""
@ -24,7 +24,7 @@ serverpassword=""
# -password \"${serverpassword}\"
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
startparameters="-name \"${servername}\" -port ${port} -webinterface -webdomain ${ip} -webuser ${webinterfaceuser} -webpassword \"${webinterfacepass}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods2 \"${mods}\""
startparameters="-name \"${servername}\" -port ${port} -webinterface -webdomain ${ip} -webuser ${httpuser} -webpassword \"${httppassword}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods2 \"${mods}\""
#### LinuxGSM Settings ####

9
lgsm/modules/command_dev_details.sh

@ -60,11 +60,10 @@ declare -A server_details=(
['Steam Master Port']="${steammasterport}"
['Telnet IP']="${telnetip}"
['Tickrate']="${tickrate}"
['Web Interface Enabled']="${httpenabled}"
['Web Interface IP']="${httpip}"
['Web Interface Password']="${webinterfacepass}"
['Web Interface Port']="${webinterfaceport}"
['Web Interface User']="${webinterfaceuser}"
['HTTP Enabled']="${httpenabled}"
['HTTP IP']="${httpip}"
['HTTP Password']="${httppassword}"
['HTTP User']="${httpuser}"
['World Name']="${worldname}"
['World Type']="${worldtype}"
)

4
lgsm/modules/command_dev_query_raw.sh

@ -82,8 +82,8 @@ echo -e "=================================================================="
echo -e "HTTP Query:"
fi
if [ -v webinterfaceport ]; then
echo -e "Web Interface: \t${webinterfaceport} \t$(ss -tupl | grep -c ${webinterfaceport}) \t$(ss -tupl | grep ${webinterfaceport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${webinterfaceport} | grep udp | awk '{ print $2 }')"
if [ -v httpport ]; then
echo -e "Web Interface: \t${httpport} \t$(ss -tupl | grep -c ${httpport}) \t$(ss -tupl | grep ${httpport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${httpport} | grep udp | awk '{ print $2 }')"
else
echo -e "Web Interface:"
fi

56
lgsm/modules/info_game.sh

@ -435,8 +435,8 @@ fn_info_game_kf() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfacepass" "webinterfacePassword"
fn_info_game_ini "webinterfaceuser" "AdminName"
fn_info_game_ini "httppassword" "httppasswordword"
fn_info_game_ini "httpuser" "AdminName"
fi
adminpassword="${adminpassword:-"NOT SET"}"
defaultmap="${defaultmap:-"NOT SET"}"
@ -451,8 +451,8 @@ fn_info_game_kf() {
steammasterport="28852"
steamworksport="20560"
httpenabled="${httpenabled:-"NOT SET"}"
webinterfacepass="${adminpassword}"
webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
httppassword="${adminpassword}"
httpuser="${httpuser:-"NOT SET"}"
}
# Config Type: ini
@ -468,7 +468,7 @@ fn_info_game_kf2() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfacepass" "webinterfacePassword"
fn_info_game_ini "httppassword" "httppasswordword"
fi
adminpassword="${adminpassword:-"NOT SET"}"
defaultmap="${defaultmap:-"NOT SET"}"
@ -478,8 +478,8 @@ fn_info_game_kf2() {
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
httpenabled="${httpenabled:-"NOT SET"}"
webinterfacepass="${webinterfacepass:-"NOT SET"}"
webinterfaceuser="Admin"
httppassword="${httppassword:-"NOT SET"}"
httpuser="Admin"
}
# Config Type: ini
@ -697,9 +697,9 @@ fn_info_game_ut99() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfacepass" "AdminPassword"
fn_info_game_ini "httppassword" "AdminPassword"
fn_info_game_ini "httpport" "ListenPort"
fn_info_game_ini "webinterfaceuser" "AdminUserName"
fn_info_game_ini "httpuser" "AdminUserName"
fi
adminpassword="${adminpassword:-"NOT SET"}"
beaconport="${beaconport:-"0"}"
@ -711,8 +711,8 @@ fn_info_game_ut99() {
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
httpenabled="${httpenabled:-"0"}"
webinterfacepass="${webinterfacepass:-"NOT SET"}"
webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
httppassword="${httppassword:-"NOT SET"}"
httpuser="${httpuser:-"NOT SET"}"
}
# Config Type: ini
@ -727,7 +727,7 @@ fn_info_game_ut3() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfacepass" "AdminPassword"
fn_info_game_ini "httppassword" "AdminPassword"
fn_info_game_ini "httpport" "ListenPort"
fi
adminpassword="${adminpassword:-"NOT SET"}"
@ -739,8 +739,8 @@ fn_info_game_ut3() {
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
httpenabled="${httpenabled:-"0"}"
webinterfacepass="${webinterfacepass:-"NOT SET"}"
webinterfaceuser="Admin"
httppassword="${httppassword:-"NOT SET"}"
httpuser="Admin"
}
# Config Type: ini
@ -757,7 +757,7 @@ fn_info_game_unreal2() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfaceuser" "AdminName"
fn_info_game_ini "httpuser" "AdminName"
fi
adminpassword="${adminpassword:-"NOT SET"}"
defaultmap="${defaultmap:-"NOT SET"}"
@ -768,8 +768,8 @@ fn_info_game_unreal2() {
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
httpenabled="${httpenabled:-"0"}"
webinterfacepass="${adminpassword:-"NOT SET"}"
webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
httppassword="${adminpassword:-"NOT SET"}"
httpuser="${httpuser:-"NOT SET"}"
}
# Config Type: ini
@ -802,7 +802,7 @@ fn_info_game_ut2k4() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfaceuser" "AdminName"
fn_info_game_ini "httpuser" "AdminName"
fi
adminpassword="${adminpassword:-"NOT SET"}"
defaultmap="${defaultmap:-"NOT SET"}"
@ -814,8 +814,8 @@ fn_info_game_ut2k4() {
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
httpenabled="${httpenabled:-"0"}"
webinterfacepass="${adminpassword}"
webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
httppassword="${adminpassword}"
httpuser="${httpuser:-"NOT SET"}"
}
# Config Type: json
@ -1584,8 +1584,8 @@ fn_info_game_ro() {
fn_info_game_ini "servername" "ServerName"
fn_info_game_ini "serverpassword" "GamePassword"
fn_info_game_ini "httpenabled" "bEnabled"
fn_info_game_ini "webinterfacepass" "webinterfacePassword"
fn_info_game_ini "webinterfaceuser" "AdminName"
fn_info_game_ini "httppassword" "httppasswordword"
fn_info_game_ini "httpuser" "AdminName"
fi
adminpassword="${adminpassword:-"NOT SET"}"
defaultmap="${defaultmap:-"NOT SET"}"
@ -1600,8 +1600,8 @@ fn_info_game_ro() {
steamport="20610"
steammasterport="28902"
httpenabled="${httpenabled:-"NOT SET"}"
webinterfacepass="${adminpassword}"
webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
httppassword="${adminpassword}"
httpuser="${httpuser:-"NOT SET"}"
}
# Config Type: QuakeC
@ -1824,7 +1824,7 @@ fn_info_game_sdtd() {
fn_info_game_xml "telnetpass" "ServerSettings/@TelnetPassword"
fn_info_game_xml "telnetport" "ServerSettings/@TelnetPort"
fn_info_game_xml "httpenabled" "ServerSettings/@ControlPanelEnabled"
fn_info_game_xml "webinterfacepass" "ServerSettings/@ControlPanelPassword"
fn_info_game_xml "httppassword" "ServerSettings/@ControlPanelPassword"
fn_info_game_xml "httpport" "ServerSettings/@ControlPanelPort"
fn_info_game_xml "worldname" "ServerSettings/@GameWorld"
@ -1835,7 +1835,7 @@ fn_info_game_sdtd() {
queryport="${queryport:-"0"}"
httpenabled="${httpenabled:-"NOT SET"}"
httpport="${httpport:-"0"}"
webinterfacepass="${webinterfacepass:-"NOT SET"}"
httppassword="${httppassword:-"NOT SET"}"
telnetenabled="${telnetenabled:-"NOT SET"}"
telnetport="${telnetport:-"0"}"
telnetpass="${telnetpass:-"NOT SET"}"
@ -1934,8 +1934,8 @@ fn_info_game_spark() {
queryport="$((port + 1))"
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
webinterfacepass="${webinterfacepass:-"NOT SET"}"
httpuser="${httpuser:-"NOT SET"}"
httppassword="${httppassword:-"NOT SET"}"
httpport="${httpport:-"0"}"
}

82
lgsm/modules/info_messages.sh

@ -35,8 +35,8 @@ fn_info_message_password_strip() {
statspassword="********"
fi
if [ "${webinterfacepass}" ]; then
webinterfacepass="********"
if [ "${httppassword}" ]; then
httppassword="********"
fi
if [ "${telnetpass}" ]; then
@ -989,7 +989,7 @@ fn_info_message_eco() {
{
fn_port "header"
fn_port "Game" port udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
} | column -s $'\t' -t
}
@ -1076,7 +1076,7 @@ fn_info_message_kf() {
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Query (GameSpy)" queryportgs udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
fn_port "LAN" lanport udp
fn_port "Steamworks P2P" steamworksport udp
fn_port "Steam Master Server" steammasterport udp
@ -1086,9 +1086,9 @@ fn_info_message_kf() {
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1098,16 +1098,16 @@ fn_info_message_kf2() {
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
} | column -s $'\t' -t
echo -e ""
echo -e "${lightgreen}${servername} Web Interface${default}"
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1277,7 +1277,7 @@ fn_info_message_ro() {
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
fn_port "LAN" lanport udp
fn_port "Steamworks P2P" steamworksport udp
fn_port "Steam Master Server" steammasterport udp
@ -1287,9 +1287,9 @@ fn_info_message_ro() {
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1365,7 +1365,7 @@ fn_info_message_sdtd() {
fn_port "Game" port udp
fn_port "Game+2" port3 udp
fn_port "Query" queryport tcp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
fn_port "Telnet" telnetport tcp
} | column -s $'\t' -t
echo -e ""
@ -1373,9 +1373,9 @@ fn_info_message_sdtd() {
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}/index.html"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}/index.html"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
echo -e ""
echo -e "${lightgreen}${gamename} Telnet${default}"
@ -1442,15 +1442,15 @@ fn_info_message_spark() {
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Web Interface" webinterfaceport tcp
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}:${webinterfaceport}/index.html"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}/index.html"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1468,13 +1468,13 @@ fn_info_message_st() {
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Web Interface" webinterfaceport tcp
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}:${webinterfaceport}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
} | column -s $'\t' -t
}
@ -1531,16 +1531,16 @@ fn_info_message_unreal() {
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "LAN Beacon" beaconport udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
} | column -s $'\t' -t
echo -e ""
echo -e "${lightgreen}${servername} Web Interface${default}"
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1550,7 +1550,7 @@ fn_info_message_ut2k4() {
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Query (GameSpy)" queryportgs udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
fn_port "LAN" lanport udp
} | column -s $'\t' -t
echo -e ""
@ -1558,9 +1558,9 @@ fn_info_message_ut2k4() {
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1571,16 +1571,16 @@ fn_info_message_unreal() {
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "LAN Beacon" beaconport udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
} | column -s $'\t' -t
echo -e ""
echo -e "${lightgreen}${servername} Web Interface${default}"
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}
@ -1607,16 +1607,16 @@ fn_info_message_ut3() {
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Web Interface" webinterfaceport tcp
fn_port "Web Interface" httpport tcp
} | column -s $'\t' -t
echo -e ""
echo -e "${lightgreen}${servername} Web Interface${default}"
fn_messages_separator
{
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t
}

Loading…
Cancel
Save