Merge branch 'release/v20.6.0'

GameServerManagers · Dec 4, 2020 · 01f8265 · 01f8265
2 parents 6f152ec + 6bf2351
commit 01f8265
Show file tree

Hide file tree

Showing 45 changed files with 603 additions and 529 deletions.
diff --git a/.github/workflows/git-sync.yml b/.github/workflows/git-sync.yml
@@ -11,17 +11,16 @@ jobs:
   repo-sync:
     runs-on: ubuntu-latest
     steps:
-    - name: ssh
-      uses: webfactory/ssh-agent@v0.2.0
+    - name: webfactory/ssh-agent
+      uses: webfactory/ssh-agent@v0.4.1
       with:
         ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
-        ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}
 
     - name: repo-sync
-      uses: wei/git-sync@v2
+      uses: wei/git-sync@v2.1.0
       with:
+        ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}
         source_repo: "https://github.com/GameServerManagers/LinuxGSM"
         source_branch: "refs/heads/*"
         destination_repo: "git@bitbucket.org:GameServerManagers/linuxgsm.git"
         destination_branch: "refs/heads/*"
-        ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}
diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg
@@ -16,8 +16,11 @@ fn_parms(){
 parms="nogui"
 }
 
-## Branch, "snapshot" include snapshot and pre-release versions. | (release|snapshot)
+## Release Settings | https://docs.linuxgsm.com/game-servers/minecraft#release-settings
+# Branch (release|snapshot)
 branch="release"
+# Version (latest|1.16)
+mcversion="latest"
 
 #### LinuxGSM Settings ####
 

diff --git a/...efault/config-lgsm/gesserver/_default.cfg → ...efault/config-lgsm/pvrserver/_default.cfg b/...efault/config-lgsm/gesserver/_default.cfg → ...efault/config-lgsm/pvrserver/_default.cfg
@@ -10,15 +10,14 @@
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
-port="27015"
-clientport="27005"
-sourcetvport="27020"
-defaultmap="ge_archives"
-maxplayers="16"
+port="7777"
+
+# Maps: bridge, datacenter, sand
+defaultmap="datacenter"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-parms="-game gesource -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="${defaultmap} -log -MultiHome=${ip} -Port=${port}"
 }
 
 #### LinuxGSM Settings ####
@@ -113,12 +112,12 @@ sleeptime="0.5"
 
 ## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
 # Server appid
-appid="310" # Source 2007 SDK
+appid="622970"
 # SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
 branch=""
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="true"
+steammaster="false"
 
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill
@@ -132,45 +131,45 @@ steammaster="true"
 # 9: GoldSrc
 # 10: Avorion
 # 11: end
-stopmode="3"
+stopmode="2"
 
 ## Query mode
 # 1: session only
 # 2: gamedig (gsquery fallback)
 # 3: gamedig
 # 4: gsquery
 # 5: tcp
-querymode="2"
-querytype="protocol-valve"
+querymode="1"
+querytype=""
 
 ## Console type
-consoleverbose="yes"
-consoleinteract="yes"
+consoleverbose="no"
+consoleinteract="no"
 
 ## Game Server Details
 # Do not edit
-gamename="GoldenEye: Source"
-engine="source"
-glibc="2.15"
+gamename="Pavlov VR"
+engine="unreal4"
+glibc="2.17"
 
 #### Directories ####
 # Edit with care
 
 ## Game Server Directories
-systemdir="${serverfiles}/gesource"
-executabledir="${serverfiles}"
-executable="./srcds_run"
-servercfgdir="${systemdir}/cfg"
-servercfg="${selfname}.cfg"
-servercfgdefault="server.cfg"
+systemdir="${serverfiles}/Pavlov"
+executabledir="${systemdir}/Binaries/Linux"
+executable="./PavlovServer"
+servercfgdir="${systemdir}/Saved/Config/LinuxServer"
+servercfg="Game.ini"
+servercfgdefault="Game.ini"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory
 backupdir="${lgsmdir}/backup"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${systemdir}/logs"
+gamelogdir="${systemdir}/Saved/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${selfname}-script.log"

diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg
diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
@@ -37,7 +37,6 @@ em,emserver,Empires Mod
 etl,etlserver,ET: Legacy
 fctr,fctrserver,Factorio
 fof,fofserver,Fistful of Frags
-ges,gesserver,GoldenEye: Source
 gmod,gmodserver,Garrys Mod
 hl2dm,hl2dmserver,Half-Life 2: Deathmatch
 hldm,hldmserver,Half-Life: Deathmatch
@@ -70,6 +69,7 @@ opfor,opforserver,Opposing Force
 pc,pcserver,Project Cars
 pstbs,pstbsserver,Post Scriptum: The Bloody Seventh
 pvkii,pvkiiserver,Pirates Vikings & Knights II
+pvr,pvrserver,Pavlov VR
 pz,pzserver,Project Zomboid
 q2,q2server,Quake 2
 q3,q3server,Quake 3: Arena
@@ -88,7 +88,6 @@ sfc,sfcserver,SourceForts Classic
 sof2,sof2server,Soldier Of Fortune 2: Gold Edition
 sol,solserver,Soldat
 squad,squadserver,Squad
-ss3,ss3server,Serious Sam 3: BFE
 st,stserver,Stationeers
 sven,svenserver,Sven Co-op
 terraria,terrariaserver,Terraria

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
@@ -52,7 +52,7 @@ EOF
 
 fn_print_dots "Sending Discord alert"
 
-discordsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${discordwebhook}")
+discordsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${discordwebhook}")
 
 if [ -n "${discordsend}" ]; then
 	fn_print_fail_nl "Sending Discord alert: ${discordsend}"

diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh
@@ -16,7 +16,7 @@ EOF
 )
 
 fn_print_dots "Sending IFTTT alert"
-iftttsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://maker.ifttt.com/trigger/${iftttevent}/with/key/${ifttttoken}" | grep "Bad Request")
+iftttsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://maker.ifttt.com/trigger/${iftttevent}/with/key/${ifttttoken}" | grep "Bad Request")
 
 if [ -n "${iftttsend}" ]; then
 	fn_print_fail_nl "Sending IFTTT alert: ${pushbulletsend}"

diff --git a/lgsm/functions/alert_mailgun.sh b/lgsm/functions/alert_mailgun.sh
@@ -14,7 +14,7 @@ fi
 
 fn_print_dots "Sending Email alert: Mailgun: ${email}"
 
-mailgunsend=$(curl -s --user "api:${mailguntoken}" \
+mailgunsend=$(curl --connect-timeout 10 -s --user "api:${mailguntoken}" \
 -F from="LinuxGSM <${mailgunemailfrom}>" \
 -F to="LinuxGSM Admin <${mailgunemail}>" \
 -F subject="${alertemoji} ${alertsubject} ${alertemoji}" \

diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh
@@ -17,7 +17,7 @@ EOF
 )
 
 fn_print_dots "Sending Pushbullet alert"
-pushbulletsend=$(curl -sSL -u """${pushbullettoken}"":" -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.pushbullet.com/v2/pushes" | grep "error_code")
+pushbulletsend=$(curl --connect-timeout 10 -sSL -u """${pushbullettoken}"":" -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.pushbullet.com/v2/pushes" | grep "error_code")
 
 if [ -n "${pushbulletsend}" ]; then
 	fn_print_fail_nl "Sending Pushbullet alert: ${pushbulletsend}"

diff --git a/lgsm/functions/alert_pushover.sh b/lgsm/functions/alert_pushover.sh
@@ -21,7 +21,7 @@ else
 	alertpriority="0"
 fi
 
-pushoversend=$(curl -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Server name</b><br>${servername}<br><br><b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
+pushoversend=$(curl --connect-timeout 10 -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Server name</b><br>${servername}<br><br><b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
 
 if [ -n "${pushoversend}" ]; then
 	fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"

diff --git a/lgsm/functions/alert_rocketchat.sh b/lgsm/functions/alert_rocketchat.sh
@@ -42,7 +42,7 @@ EOF
 
 fn_print_dots "Sending Rocketchat alert"
 
-rocketchatsend=$(curl -sSL -H "Content-Type:application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${rocketchatwebhook}")
+rocketchatsend=$(curl --connect-timeout 10 -sSL -H "Content-Type:application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${rocketchatwebhook}")
 
 if [ -n "${rocketchatsend}" ]; then
 	fn_print_ok_nl "Sending Rocketchat alert"