Browse Source

Merge branch 'release/v21.4.0'

pull/3642/head v21.4.0
Daniel Gibbs 3 years ago
parent
commit
5641081a74
No known key found for this signature in database GPG Key ID: 2EBB36015C6D78E2
  1. 186
      lgsm/config-default/config-lgsm/sfserver/_default.cfg
  2. 1
      lgsm/data/almalinux-8.csv
  3. 1
      lgsm/data/centos-7.csv
  4. 1
      lgsm/data/centos-8.csv
  5. 1
      lgsm/data/debian-10.csv
  6. 1
      lgsm/data/debian-11.csv
  7. 1
      lgsm/data/debian-9.csv
  8. 1
      lgsm/data/rhel-7.csv
  9. 1
      lgsm/data/rhel-8.csv
  10. 1
      lgsm/data/rocky-8.csv
  11. 1
      lgsm/data/serverlist.csv
  12. 1
      lgsm/data/ubuntu-16.04.csv
  13. 1
      lgsm/data/ubuntu-18.04.csv
  14. 1
      lgsm/data/ubuntu-20.04.csv
  15. 1
      lgsm/data/ubuntu-21.04.csv
  16. 23
      lgsm/functions/info_messages.sh
  17. 7
      lgsm/functions/install_config.sh
  18. 2
      linuxgsm.sh
  19. 2
      tests/tests_fctrserver.sh
  20. 2
      tests/tests_jc2server.sh
  21. 2
      tests/tests_mcserver.sh
  22. 2
      tests/tests_ts3server.sh

186
lgsm/config-default/config-lgsm/sfserver/_default.cfg

@ -0,0 +1,186 @@
##################################
######## Default Settings ########
##################################
# DO NOT EDIT, ANY CHANGES 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.
#### Game Server Settings ####
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
ip="0.0.0.0"
queryport="15777"
beaconport="15000"
port="7777"
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
startparameters="FactoryGame -ServerQueryPort=${queryport} -BeaconPort=${beaconport} -GamePort=${port} -log -unattended"
#### LinuxGSM Settings ####
## LinuxGSM Stats
# Send useful stats to LinuxGSM developers.
# https://docs.linuxgsm.com/configuration/linuxgsm-stats
# (on|off)
stats="off"
## 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"
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
discordwebhook="webhook"
# Email Alerts | https://docs.linuxgsm.com/alerts/email
emailalert="off"
email="email@example.com"
emailfrom=""
# Gotify Alerts | https://docs.linuxgsm.com/alerts/gotify
gotifyalert="off"
gotifytoken="token"
gotifywebhook="webhook"
# 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"
mailgunapiregion="us"
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"
pushoveruserkey="userkey"
# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
rocketchatalert="off"
rocketchatwebhook="webhook"
rocketchattoken=""
# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
slackalert="off"
slackwebhook="webhook"
# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
# You can add a custom cURL string eg proxy (useful in Russia) in "curlcustomstring".
# For example "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help".
telegramapi="api.telegram.org"
telegramalert="off"
telegramtoken="accesstoken"
telegramchatid=""
curlcustomstring=""
## Updating | https://docs.linuxgsm.com/commands/update
updateonstart="off"
## 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"
## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
ansi="on"
#### Advanced Settings ####
## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
sleeptime="0.5"
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
# Server appid
appid="1690800"
steamcmdforcewindows="no"
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
branch=""
betapassword=""
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
steammaster="false"
## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
# 1: tmux kill
# 2: CTRL+c
# 3: quit
# 4: quit 120s
# 5: stop
# 6: q
# 7: exit
# 8: 7 Days to Die
# 9: GoldSrc
# 10: Avorion
# 11: end
stopmode="2"
## Query mode
# 1: session only
# 2: gamedig (gsquery fallback)
# 3: gamedig
# 4: gsquery
# 5: tcp
querymode="1"
querytype=""
## Console type
consoleverbose="yes"
consoleinteract="no"
## Game Server Details
# Do not edit
gamename="Satisfactory"
engine="unreal4"
glibc="2.17"
#### Directories ####
# Edit with care
## Game Server Directories
systemdir="${serverfiles}/FactoryGame"
executabledir="${serverfiles}/Engine/Binaries/Linux"
executable="./UE4Server-Linux-Shipping"
servercfgdir="${systemdir}/Saved/Config/LinuxServer"
servercfg="GameUserSettings.ini"
servercfgdefault="GameUserSettings.ini"
servercfgfullpath="${servercfgdir}/${servercfg}"
## Backup Directory
backupdir="${lgsmdir}/backup"
## Logging Directories
logdir="${rootdir}/log"
gamelogdir="${systemdir}/Saved/Logs"
lgsmlogdir="${logdir}/script"
consolelogdir="${logdir}/console"
lgsmlog="${lgsmlogdir}/${selfname}-script.log"
consolelog="${consolelogdir}/${selfname}-console.log"
alertlog="${lgsmlogdir}/${selfname}-alert.log"
postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
## Logs Naming
lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

1
lgsm/data/almalinux-8.csv

@ -93,6 +93,7 @@ scpsl
scpslsm
sdtd,telnet,expect
sfc,ncurses-libs.i686
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/centos-7.csv

@ -93,6 +93,7 @@ scpsl
scpslsm
sdtd,telnet,expect
sfc,ncurses-libs.i686
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/centos-8.csv

@ -93,6 +93,7 @@ scpsl
scpslsm
sdtd,telnet,expect
sfc,ncurses-libs.i686
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/debian-10.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/debian-11.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/debian-9.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/rhel-7.csv

@ -93,6 +93,7 @@ scpsl
scpslsm
sdtd,telnet,expect
sfc,ncurses-libs.i686
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/rhel-8.csv

@ -93,6 +93,7 @@ scpsl
scpslsm
sdtd,telnet,expect
sfc,ncurses-libs.i686
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/rocky-8.csv

@ -93,6 +93,7 @@ scpsl
scpslsm
sdtd,telnet,expect
sfc,ncurses-libs.i686
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/serverlist.csv

@ -91,6 +91,7 @@ scpsl,scpslserver,SCP: Secret Laboratory
scpslsm,scpslsmserver,SCP: Secret Laboratory ServerMod
sdtd,sdtdserver,7 Days to Die
sfc,sfcserver,SourceForts Classic
sf,sfserver,Satisfactory
sof2,sof2server,Soldier Of Fortune 2: Gold Edition
sol,solserver,Soldat
squad,squadserver,Squad

1 ac acserver Assetto Corsa

1
lgsm/data/ubuntu-16.04.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-18.04.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-20.04.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-21.04.csv

@ -93,6 +93,7 @@ scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect
sfc,libtinfo5:i386
sf
sof2
sol
squad

Can't render this file because it has a wrong number of fields in line 2.

23
lgsm/functions/info_messages.sh

@ -1032,16 +1032,6 @@ fn_info_message_jk2(){
} | column -s $'\t' -t
}
fn_info_message_lo(){
echo -e "netstat -atunp | grep MistServer"
echo -e ""
{
echo -e "${lightblue}DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL${default}"
echo -e "> Game\tINBOUND\t${port}\tudp"
echo -e "> Query\tINBOUND\t${queryport}\tudp"
} | column -s $'\t' -t
}
fn_info_message_kf(){
{
fn_port "header"
@ -1342,6 +1332,15 @@ fn_info_message_sdtd(){
} | column -s $'\t' -t
}
fn_info_message_sf(){
{
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Beacon" beaconport udp
} | column -s $'\t' -t
}
fn_info_message_sof2(){
{
fn_port "header"
@ -1653,8 +1652,6 @@ fn_info_message_select_engine(){
fn_info_message_jc3
elif [ "${shortname}" == "jk2" ]; then
fn_info_message_jk2
elif [ "${shortname}" == "lo" ]; then
fn_info_message_lo
elif [ "${shortname}" == "kf" ]; then
fn_info_message_kf
elif [ "${shortname}" == "kf2" ]; then
@ -1707,6 +1704,8 @@ fn_info_message_select_engine(){
fn_info_message_scpsl
elif [ "${shortname}" == "sdtd" ]; then
fn_info_message_sdtd
elif [ "${shortname}" == "sf" ]; then
fn_info_message_sf
elif [ "${shortname}" == "sof2" ]; then
fn_info_message_sof2
elif [ "${shortname}" == "sol" ]; then

7
lgsm/functions/install_config.sh

@ -680,6 +680,13 @@ elif [ "${shortname}" == "scpsl" ]||[ "${shortname}" == "scpslsm" ]; then
fn_default_config_remote
fn_set_config_vars
fn_list_config_locations
elif [ "${shortname}" == "sf" ]; then
gamedirname="Satisfactory"
array_configs+=( GameUserSettings.ini )
fn_fetch_default_config
fn_default_config_remote
fn_set_config_vars
fn_list_config_locations
elif [ "${shortname}" == "sol" ]; then
gamedirname="Soldat"
array_configs+=( soldat.ini )

2
linuxgsm.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.3.3"
version="v21.4.0"
shortname="core"
gameservername="core"
commandname="CORE"

2
tests/tests_fctrserver.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.3.3"
version="v21.4.0"
shortname="fctr"
gameservername="fctrserver"
commandname="CORE"

2
tests/tests_jc2server.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.3.3"
version="v21.4.0"
shortname="jc2"
gameservername="jc2server"
commandname="CORE"

2
tests/tests_mcserver.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.3.3"
version="v21.4.0"
shortname="mc"
gameservername="mcserver"
commandname="CORE"

2
tests/tests_ts3server.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v21.3.3"
version="v21.4.0"
shortname="ts3"
gameservername="ts3server"
commandname="CORE"

Loading…
Cancel
Save