Skip to content

Commit b1e321e

Browse files
dgibbs64dgibbs64
authored
Hotfix v21.1.2 (#3215)
* feat(newserver): Valheim (#3212) * fix(backup): resolve issues with lockfile check and creation (#3214)
2 parents 1300fb3 + 90a75ae commit b1e321e

File tree

13 files changed

+230
-24
lines changed

13 files changed

+230
-24
lines changed

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

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
##################################
2+
######## Default Settings ########
3+
##################################
4+
# DO NOT EDIT, ANY CHANGES WILL BE OVERWRITTEN!
5+
# Copy settings from here and use them in either:
6+
# common.cfg - applies settings to every instance.
7+
# [instance].cfg - applies settings to a specific instance.
8+
9+
#### Game Server Settings ####
10+
11+
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
12+
servername="Valheim Server"
13+
serverpassword=""
14+
port="2456"
15+
gameworld="${selfname}"
16+
public="1"
17+
18+
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
19+
startparameters="-name ${servername} -password ${serverpassword} -port ${port} -world ${gameworld} -public ${public}"
20+
21+
#### LinuxGSM Settings ####
22+
23+
## LinuxGSM Stats
24+
# Send useful stats to LinuxGSM developers.
25+
# https://docs.linuxgsm.com/configuration/linuxgsm-stats
26+
# (on|off)
27+
stats="off"
28+
29+
## Notification Alerts
30+
# (on|off)
31+
32+
# Display IP | https://docs.linuxgsm.com/alerts#display-ip
33+
displayip=""
34+
35+
# More info | https://docs.linuxgsm.com/alerts#more-info
36+
postalert="off"
37+
38+
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
39+
discordalert="off"
40+
discordwebhook="webhook"
41+
42+
# Email Alerts | https://docs.linuxgsm.com/alerts/email
43+
emailalert="off"
44+
email="[email protected]"
45+
emailfrom=""
46+
47+
# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
48+
iftttalert="off"
49+
ifttttoken="accesstoken"
50+
iftttevent="linuxgsm_alert"
51+
52+
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
53+
mailgunalert="off"
54+
mailgunapiregion="us"
55+
mailguntoken="accesstoken"
56+
mailgundomain="example.com"
57+
mailgunemailfrom="[email protected]"
58+
mailgunemail="[email protected]"
59+
60+
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
61+
pushbulletalert="off"
62+
pushbullettoken="accesstoken"
63+
channeltag=""
64+
65+
# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
66+
pushoveralert="off"
67+
pushovertoken="accesstoken"
68+
pushoveruserkey="userkey"
69+
70+
# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
71+
rocketchatalert="off"
72+
rocketchatwebhook="webhook"
73+
rocketchattoken=""
74+
75+
# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
76+
slackalert="off"
77+
slackwebhook="webhook"
78+
79+
# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
80+
# You can add a custom cURL string eg proxy (useful in Russia) in "curlcustomstring".
81+
# For example "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help".
82+
telegramalert="off"
83+
telegramtoken="accesstoken"
84+
telegramchatid=""
85+
curlcustomstring=""
86+
87+
## Updating | https://docs.linuxgsm.com/commands/update
88+
updateonstart="off"
89+
90+
## Backup | https://docs.linuxgsm.com/commands/backup
91+
maxbackups="4"
92+
maxbackupdays="30"
93+
stoponbackup="on"
94+
95+
## Logging | https://docs.linuxgsm.com/features/logging
96+
consolelogging="on"
97+
logdays="7"
98+
99+
## Monitor | https://docs.linuxgsm.com/commands/monitor
100+
# Query delay time
101+
querydelay="5"
102+
103+
## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
104+
ansi="on"
105+
106+
#### Advanced Settings ####
107+
108+
## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
109+
sleeptime="0.5"
110+
111+
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
112+
# Server appid
113+
appid="896660"
114+
steamcmdforcewindows="no"
115+
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
116+
branch=""
117+
betapassword=""
118+
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
119+
steammaster="false"
120+
121+
## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
122+
# 1: tmux kill
123+
# 2: CTRL+c
124+
# 3: quit
125+
# 4: quit 120s
126+
# 5: stop
127+
# 6: q
128+
# 7: exit
129+
# 8: 7 Days to Die
130+
# 9: GoldSrc
131+
# 10: Avorion
132+
# 11: end
133+
stopmode="2"
134+
135+
## Query mode
136+
# 1: session only
137+
# 2: gamedig (gsquery fallback)
138+
# 3: gamedig
139+
# 4: gsquery
140+
# 5: tcp
141+
querymode="1"
142+
querytype=""
143+
144+
## Console type
145+
consoleverbose="yes"
146+
consoleinteract="no"
147+
148+
## Game Server Details
149+
# Do not edit
150+
gamename="Valheim"
151+
engine="unity3d"
152+
glibc="2.15"
153+
154+
#### Directories ####
155+
# Edit with care
156+
157+
## Game Server Directories
158+
systemdir="${serverfiles}"
159+
executabledir="${serverfiles}"
160+
executable="./valheim_server.x86_64"
161+
serverfiles="${rootdir}/serverfiles"
162+
163+
## Backup Directory
164+
backupdir="${lgsmdir}/backup"
165+
166+
## Logging Directories
167+
logdir="${rootdir}/log"
168+
gamelogdir="${systemdir}/Saved/Logs"
169+
lgsmlogdir="${logdir}/script"
170+
consolelogdir="${logdir}/console"
171+
lgsmlog="${lgsmlogdir}/${selfname}-script.log"
172+
consolelog="${consolelogdir}/${selfname}-console.log"
173+
alertlog="${lgsmlogdir}/${selfname}-alert.log"
174+
postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
175+
176+
## Logs Naming
177+
lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
178+
consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

‎lgsm/data/serverlist.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ ut,utserver,Unreal Tournament
105105
ut2k4,ut2k4server,Unreal Tournament 2004
106106
ut3,ut3server,Unreal Tournament 3
107107
ut99,ut99server,Unreal Tournament 99
108+
vh,vhserver,Valheim
108109
vs,vsserver,Vampire Slayer
109110
vints,vintsserver,Vintage Story
110111
wet,wetserver,Wolfenstein: Enemy Territory

‎lgsm/functions/command_backup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,12 @@ fn_backup_start_server(){
254254
}
255255

256256
# Run functions.
257-
fn_backup_create_lockfile
257+
fn_backup_check_lockfile
258258
fn_backup_init
259259
fn_backup_stop_server
260260
fn_backup_dir
261261
fn_backup_migrate_olddir
262-
fn_backup_check_lockfile
262+
fn_backup_create_lockfile
263263
fn_backup_compression
264264
fn_backup_prune
265265
fn_backup_start_server

‎lgsm/functions/core_functions.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v21.1.1"
11+
modulesversion="v21.1.2"
1212

1313
# Core
1414

@@ -490,6 +490,11 @@ functionfile="${FUNCNAME[0]}"
490490
fn_fetch_function
491491
}
492492

493+
fix_vh.sh(){
494+
functionfile="${FUNCNAME[0]}"
495+
fn_fetch_function
496+
}
497+
493498
fix_wurm.sh(){
494499
functionfile="${FUNCNAME[0]}"
495500
fn_fetch_function

‎lgsm/functions/core_steamcmd.sh

100644100755
File mode changed.

‎lgsm/functions/fix.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ if [ "${commandname}" != "INSTALL" ]&&[ -z "${fixbypass}" ]; then
8383
fix_mta.sh
8484
elif [ "${shortname}" == "unt" ]; then
8585
fix_unt.sh
86+
elif [ "${shortname}" == "vh" ]; then
87+
fix_vh.sh
8688
elif [ "${shortname}" == "wurm" ]; then
8789
fix_wurm.sh
8890
elif [ "${shortname}" == "zmr" ]; then

‎lgsm/functions/fix_vh.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
# LinuxGSM fix_rust.sh function
3+
# Author: Alasdair Haig
4+
# Website: https://linuxgsm.com
5+
# Description: Resolves startup issue with Valheim
6+
7+
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
8+
9+
export LD_LIBRARY_PATH=./linux64:$LD_LIBRARY_PATH

‎lgsm/functions/info_messages.sh

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ fn_info_message_ports(){
583583
parmslocation="${servercfgfullpath}"
584584
fi
585585
done
586-
# engines/games that require editing the parms.
587-
local ports_edit_array=( "Avorion" "col" "goldsrc" "Factorio" "Hurtworld" "iw3.0" "ioquake3" "qfusion" "Rust" "scpsl" "scpslsm" "Soldat" "spark" "source" "starbound" "unreal4" "realvirtuality" "Unturned" )
586+
# engines/games that require editing the start parameters.
587+
local ports_edit_array=( "Avorion" "col" "goldsrc" "Factorio" "Hurtworld" "iw3.0" "ioquake3" "qfusion" "Rust" "scpsl" "scpslsm" "Soldat" "spark" "source" "starbound" "unreal4" "realvirtuality" "Unturned" "vh" )
588588
for port_edit in "${ports_edit_array[@]}"; do
589589
if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]||[ "${shortname}" == "${port_edit}" ]; then
590590
parmslocation="${configdirserver}"
@@ -1341,6 +1341,15 @@ fn_info_message_ut(){
13411341
} | column -s $'\t' -t
13421342
}
13431343

1344+
fn_info_message_vh(){
1345+
echo -e "netstat -atunp | grep valheim"
1346+
echo -e ""
1347+
{
1348+
echo -e "${lightblue}DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL${default}"
1349+
echo -e "> Game\tINBOUND\t${port}\tudp"
1350+
} | column -s $'\t' -t
1351+
}
1352+
13441353
fn_info_message_kf2(){
13451354
fn_info_message_password_strip
13461355
echo -e "netstat -atunp | grep KFGame"
@@ -1486,6 +1495,10 @@ fn_info_message_select_engine(){
14861495
fn_info_message_avorion
14871496
elif [ "${shortname}" == "arma3" ]; then
14881497
fn_info_message_arma3
1498+
elif [ "${shortname}" == "bf1942" ]; then
1499+
fn_info_message_bf1942
1500+
elif [ "${shortname}" == "bfv" ]; then
1501+
fn_info_message_bfv
14891502
elif [ "${shortname}" == "bo" ]; then
14901503
fn_info_message_ballisticoverkill
14911504
elif [ "${shortname}" == "bt" ]; then
@@ -1526,8 +1539,18 @@ fn_info_message_select_engine(){
15261539
fn_info_message_justcause3
15271540
elif [ "${shortname}" == "kf2" ]; then
15281541
fn_info_message_kf2
1542+
elif [ "${shortname}" == "mc" ]; then
1543+
fn_info_message_minecraft
15291544
elif [ "${shortname}" == "mcb" ]; then
15301545
fn_info_message_minecraft_bedrock
1546+
elif [ "${shortname}" == "mh" ]; then
1547+
fn_info_message_mordhau
1548+
elif [ "${shortname}" == "mohaa" ]; then
1549+
fn_info_message_mohaa
1550+
elif [ "${shortname}" == "mta" ]; then
1551+
fn_info_message_mta
1552+
elif [ "${shortname}" == "mumble" ]; then
1553+
fn_info_message_mumble
15311554
elif [ "${shortname}" == "onset" ]; then
15321555
fn_info_message_onset
15331556
elif [ "${shortname}" == "mom" ]; then
@@ -1576,20 +1599,8 @@ fn_info_message_select_engine(){
15761599
fn_info_message_unturned
15771600
elif [ "${shortname}" == "ut" ]; then
15781601
fn_info_message_ut
1579-
elif [ "${shortname}" == "mc" ]; then
1580-
fn_info_message_minecraft
1581-
elif [ "${shortname}" == "mh" ]; then
1582-
fn_info_message_mordhau
1583-
elif [ "${shortname}" == "mohaa" ]; then
1584-
fn_info_message_mohaa
1585-
elif [ "${shortname}" == "mta" ]; then
1586-
fn_info_message_mta
1587-
elif [ "${shortname}" == "mumble" ]; then
1588-
fn_info_message_mumble
1589-
elif [ "${shortname}" == "bf1942" ]; then
1590-
fn_info_message_bf1942
1591-
elif [ "${shortname}" == "bfv" ]; then
1592-
fn_info_message_bfv
1602+
elif [ "${shortname}" == "vh" ]; then
1603+
fn_info_message_vh
15931604
elif [ "${shortname}" == "rtcw" ]; then
15941605
fn_info_message_rtcw
15951606
elif [ "${shortname}" == "pvr" ]; then

‎linuxgsm.sh

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.1.1"
23+
version="v21.1.2"
2424
shortname="core"
2525
gameservername="core"
2626
commandname="CORE"

‎tests/tests_fctrserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.1.1"
23+
version="v21.1.2"
2424
shortname="fctr"
2525
gameservername="fctrserver"
2626
commandname="CORE"

0 commit comments

Comments
 (0)