Skip to content

Commit 01f8265

Browse files
dgibbs64dgibbs64
committed
Merge branch 'release/v20.6.0'
2 parents 6f152ec + 6bf2351 commit 01f8265

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+603
-529
lines changed

‎.github/workflows/git-sync.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ jobs:
1111
repo-sync:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: ssh
15-
uses: webfactory/ssh-agent@v0.2.0
14+
- name: webfactory/ssh-agent
15+
uses: webfactory/ssh-agent@v0.4.1
1616
with:
1717
ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
18-
ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}
1918

2019
- name: repo-sync
21-
uses: wei/git-sync@v2
20+
uses: wei/git-sync@v2.1.0
2221
with:
22+
ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}
2323
source_repo: "https://github.com/GameServerManagers/LinuxGSM"
2424
source_branch: "refs/heads/*"
2525
destination_repo: "[email protected]:GameServerManagers/linuxgsm.git"
2626
destination_branch: "refs/heads/*"
27-
ssh_private_key: ${{ secrets.BITBUCKET_SECRET }}

‎lgsm/config-default/config-lgsm/mcserver/_default.cfg

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ fn_parms(){
1616
parms="nogui"
1717
}
1818

19-
## Branch, "snapshot" include snapshot and pre-release versions. | (release|snapshot)
19+
## Release Settings | https://docs.linuxgsm.com/game-servers/minecraft#release-settings
20+
# Branch (release|snapshot)
2021
branch="release"
22+
# Version (latest|1.16)
23+
mcversion="latest"
2124

2225
#### LinuxGSM Settings ####
2326

‎lgsm/config-default/config-lgsm/gesserver/_default.cfg renamed to ‎lgsm/config-default/config-lgsm/pvrserver/_default.cfg

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010

1111
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1212
ip="0.0.0.0"
13-
port="27015"
14-
clientport="27005"
15-
sourcetvport="27020"
16-
defaultmap="ge_archives"
17-
maxplayers="16"
13+
port="7777"
14+
15+
# Maps: bridge, datacenter, sand
16+
defaultmap="datacenter"
1817

1918
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
2019
fn_parms(){
21-
parms="-game gesource -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
20+
parms="${defaultmap} -log -MultiHome=${ip} -Port=${port}"
2221
}
2322

2423
#### LinuxGSM Settings ####
@@ -113,12 +112,12 @@ sleeptime="0.5"
113112

114113
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
115114
# Server appid
116-
appid="310" # Source 2007 SDK
115+
appid="622970"
117116
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
118117
branch=""
119118
betapassword=""
120119
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
121-
steammaster="true"
120+
steammaster="false"
122121

123122
## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
124123
# 1: tmux kill
@@ -132,45 +131,45 @@ steammaster="true"
132131
# 9: GoldSrc
133132
# 10: Avorion
134133
# 11: end
135-
stopmode="3"
134+
stopmode="2"
136135

137136
## Query mode
138137
# 1: session only
139138
# 2: gamedig (gsquery fallback)
140139
# 3: gamedig
141140
# 4: gsquery
142141
# 5: tcp
143-
querymode="2"
144-
querytype="protocol-valve"
142+
querymode="1"
143+
querytype=""
145144

146145
## Console type
147-
consoleverbose="yes"
148-
consoleinteract="yes"
146+
consoleverbose="no"
147+
consoleinteract="no"
149148

150149
## Game Server Details
151150
# Do not edit
152-
gamename="GoldenEye: Source"
153-
engine="source"
154-
glibc="2.15"
151+
gamename="Pavlov VR"
152+
engine="unreal4"
153+
glibc="2.17"
155154

156155
#### Directories ####
157156
# Edit with care
158157

159158
## Game Server Directories
160-
systemdir="${serverfiles}/gesource"
161-
executabledir="${serverfiles}"
162-
executable="./srcds_run"
163-
servercfgdir="${systemdir}/cfg"
164-
servercfg="${selfname}.cfg"
165-
servercfgdefault="server.cfg"
159+
systemdir="${serverfiles}/Pavlov"
160+
executabledir="${systemdir}/Binaries/Linux"
161+
executable="./PavlovServer"
162+
servercfgdir="${systemdir}/Saved/Config/LinuxServer"
163+
servercfg="Game.ini"
164+
servercfgdefault="Game.ini"
166165
servercfgfullpath="${servercfgdir}/${servercfg}"
167166

168167
## Backup Directory
169168
backupdir="${lgsmdir}/backup"
170169

171170
## Logging Directories
172171
logdir="${rootdir}/log"
173-
gamelogdir="${systemdir}/logs"
172+
gamelogdir="${systemdir}/Saved/Logs"
174173
lgsmlogdir="${logdir}/script"
175174
consolelogdir="${logdir}/console"
176175
lgsmlog="${lgsmlogdir}/${selfname}-script.log"

‎lgsm/config-default/config-lgsm/ss3server/_default.cfg

Lines changed: 0 additions & 181 deletions
This file was deleted.

‎lgsm/data/serverlist.csv

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ em,emserver,Empires Mod
3737
etl,etlserver,ET: Legacy
3838
fctr,fctrserver,Factorio
3939
fof,fofserver,Fistful of Frags
40-
ges,gesserver,GoldenEye: Source
4140
gmod,gmodserver,Garrys Mod
4241
hl2dm,hl2dmserver,Half-Life 2: Deathmatch
4342
hldm,hldmserver,Half-Life: Deathmatch
@@ -70,6 +69,7 @@ opfor,opforserver,Opposing Force
7069
pc,pcserver,Project Cars
7170
pstbs,pstbsserver,Post Scriptum: The Bloody Seventh
7271
pvkii,pvkiiserver,Pirates Vikings & Knights II
72+
pvr,pvrserver,Pavlov VR
7373
pz,pzserver,Project Zomboid
7474
q2,q2server,Quake 2
7575
q3,q3server,Quake 3: Arena
@@ -88,7 +88,6 @@ sfc,sfcserver,SourceForts Classic
8888
sof2,sof2server,Soldier Of Fortune 2: Gold Edition
8989
sol,solserver,Soldat
9090
squad,squadserver,Squad
91-
ss3,ss3server,Serious Sam 3: BFE
9291
st,stserver,Stationeers
9392
sven,svenserver,Sven Co-op
9493
terraria,terrariaserver,Terraria

‎lgsm/functions/alert_discord.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ EOF
5252

5353
fn_print_dots "Sending Discord alert"
5454

55-
discordsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${discordwebhook}")
55+
discordsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${discordwebhook}")
5656

5757
if [ -n "${discordsend}" ]; then
5858
fn_print_fail_nl "Sending Discord alert: ${discordsend}"

‎lgsm/functions/alert_ifttt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EOF
1616
)
1717

1818
fn_print_dots "Sending IFTTT alert"
19-
iftttsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://maker.ifttt.com/trigger/${iftttevent}/with/key/${ifttttoken}" | grep "Bad Request")
19+
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")
2020

2121
if [ -n "${iftttsend}" ]; then
2222
fn_print_fail_nl "Sending IFTTT alert: ${pushbulletsend}"

‎lgsm/functions/alert_mailgun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414

1515
fn_print_dots "Sending Email alert: Mailgun: ${email}"
1616

17-
mailgunsend=$(curl -s --user "api:${mailguntoken}" \
17+
mailgunsend=$(curl --connect-timeout 10 -s --user "api:${mailguntoken}" \
1818
-F from="LinuxGSM <${mailgunemailfrom}>" \
1919
-F to="LinuxGSM Admin <${mailgunemail}>" \
2020
-F subject="${alertemoji} ${alertsubject} ${alertemoji}" \

‎lgsm/functions/alert_pushbullet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ EOF
1717
)
1818

1919
fn_print_dots "Sending Pushbullet alert"
20-
pushbulletsend=$(curl -sSL -u """${pushbullettoken}"":" -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.pushbullet.com/v2/pushes" | grep "error_code")
20+
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")
2121

2222
if [ -n "${pushbulletsend}" ]; then
2323
fn_print_fail_nl "Sending Pushbullet alert: ${pushbulletsend}"

‎lgsm/functions/alert_pushover.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ else
2121
alertpriority="0"
2222
fi
2323

24-
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)
24+
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)
2525

2626
if [ -n "${pushoversend}" ]; then
2727
fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"

0 commit comments

Comments
 (0)