Skip to content

Commit 24a723f

Browse files
dgibbs64dgibbs64
committed
Merge branch 'hotfix/v21.3.2'
2 parents 0d9395a + 222eb9d commit 24a723f

20 files changed

+95
-62
lines changed

‎.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
99
liberapay: # Replace with a single Liberapay username
1010
issuehunt: # Replace with a single IssueHunt username
1111
otechie: # Replace with a single Otechie username
12-
custom: [paypal.me/dgibbs64] # Replace with a single custom sponsorship URL
12+
custom: # Replace with a single custom sponsorship URL

‎.github/labeler.yml

Lines changed: 54 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,98 @@
11
# Add/remove 'critical' label if issue contains the words 'urgent' or 'critical'
22
# Type
33
"type: game server request":
4-
- '(Server Request)'
4+
- '/(Server Request)/i'
55
"type: bug":
6-
- '(bug)'
6+
- '/(bug)/i'
77
"type: feature request":
8-
- '(feature)'
8+
- '/(feature)/i'
99
# Commands
1010
"command: backup":
11-
- '(backup)'
11+
- '/(backup)/i'
1212
"command: console":
13-
- '(console|tmux)'
13+
- '/(console|tmux)/i'
1414
"command: debug":
15-
- '(debug)'
15+
- '/(debug)/i'
1616
"command: details":
17-
- '(details)'
17+
- '/(details)/i'
1818
"command: fast-dl":
19-
- '(fast-dl|fastdl)'
19+
- '/(fast-dl|fastdl)/i'
2020
"command: install":
21-
- '(install)'
21+
- '/(install)/i'
2222
"command: mods":
23-
- '(mods)'
23+
- '/(mods)/i'
2424
"command: monitor":
25-
- '(monitor)'
25+
- '/(monitor)/i'
2626
"command: post-details":
27-
- '(post-details)'
27+
- '/(post-details)/i'
2828
"command: restart":
29-
- '(restart)'
29+
- '/(restart)/i'
3030
"command: send":
31-
- '(send)'
31+
- '/(send)/i'
3232
"command: skeleton":
33-
- '(skeleton)'
33+
- '/(skeleton)/i'
3434
"command: start":
35-
- '(start)'
35+
- '/(start)/i'
3636
"command: stop":
37-
- '(stop)'
37+
- '/(stop)/i'
3838
"command: update-lgsm":
39-
- '(update-lgsm)'
39+
- '/(update-lgsm)/i'
4040
"command: update":
41-
- '(update)'
41+
- '/(update)/i'
4242
"command: validate":
43-
- '(validate)'
43+
- '/(validate)/i'
4444
"command: wipe":
45-
- '(wipe)'
45+
- '/(wipe)/i'
4646
# Distros
4747
"distro: AlmaLinux":
48-
- '(Alma)'
48+
- '/(Alma)/i'
4949
"distro: Arch Linux":
50-
- '(Arch)'
50+
- '/(Arch)/i'
5151
"distro: CentOS":
52-
- '(CentOS)'
52+
- '/(CentOS)/i'
5353
"distro: Debian":
54-
- '(Debian)'
54+
- '/(Debian)/i'
5555
"distro: Fedora":
56-
- '(Fedora)'
56+
- '/(Fedora)/i'
5757
"distro: openSUSE":
58-
- '(openSUSE)'
58+
- '/(openSUSE|suse)/i'
5959
"distro: Rocky Linux":
60-
- '(Rocky)'
60+
- '/(Rocky)/i'
6161
"distro: Slackware":
62-
- '(Slackware)'
62+
- '/(Slackware)/i'
6363
"distro: Ubuntu":
64-
- '(Ubuntu)'
64+
- '/(Ubuntu)/i'
6565
# Info
6666
"info: alerts":
67-
- '(alert)'
67+
- '/(alert)/i'
6868
"info: dependency":
69-
- '(dependency|deps)'
69+
- '/(dependency|deps)/i'
7070
"info: docker":
71-
- '(docker)'
71+
- '/(docker)/i'
7272
"info: docs":
73-
- '(documentation|docs)'
73+
- '/(documentation|docs)/i'
7474
"info: email":
75-
- '(postfix|sendmail|exim|smtp)'
75+
- '/(postfix|sendmail|exim|smtp)/i'
76+
"info: query":
77+
- '/(gamedig|gsquery)/i'
7678
"info: steamcmd":
77-
- '(steamcmd)'
79+
- '/(steamcmd)/i'
7880
"info: systemd":
79-
- '(systemd)'
81+
- '/(systemd)/i'
8082
"info: tmux":
81-
- '(tmux)'
83+
- '/(tmux)/i'
8284
"info: website":
83-
- '(website)'
85+
- '/(website)/i'
86+
# Games
87+
"game: Ark: Survival Evolved":
88+
- '/(Ark: Survival Evolved|Ark)/i'
89+
"game: ARMA 3":
90+
- '/(ARMA 3)/i'
91+
"game: Assetto Corsa":
92+
- '/(Assetto Corsa)/i'
93+
"game: Avorion":
94+
- '/(Avorion)/i'
95+
"game: Ballistic Overkill":
96+
- '/(Ballistic Overkill)/i'
97+
"game: Barotrauma":
98+
- '/(Barotrauma)/i'

‎.github/pr-labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
feature: ['feature/*', 'feat/*']
2+
hotfix: hotfix/*
3+
release: release/*

‎.github/workflows/label-sponsors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Label sponsors
22
on:
33
pull_request:
4-
types: [opened, edited]
4+
types: [opened]
55
issues:
6-
types: [opened, edited]
6+
types: [opened]
77
jobs:
88
build:
99
name: is-sponsor-label

‎.github/workflows/labeler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ jobs:
77
triage:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: github/issue-labeler@v2.0
10+
- uses: github/issue-labeler@v2.4
1111
with:
1212
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1313
configuration-path: .github/labeler.yml
14+
not-before:
15+
enable-versioned-regex: 0

‎.github/workflows/pr-labeler.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Labeler
2+
on:
3+
pull_request:
4+
types: [opened, edited, closed]
5+
6+
jobs:
7+
pr-labeler:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: TimonVS/pr-labeler-action@v3
11+
with:
12+
configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
#### Game Server Settings ####
1010

11-
## SteamCMD Login | https://docs.linuxgsm.com/steamcmd#steamcmd-login
12-
steamuser="username"
13-
steampass='password'
14-
1511
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1612
## https://docs.linuxgsm.com/game-servers/last-oasis
1713
servername="${selfname}"

‎lgsm/data/ubuntu-21.04.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ squad
9999
st
100100
stn
101101
sven,libssl1.1:i386,zlib1g:i386
102-
terraria
102+
terraria,libsdl
103103
tf2,libcurl4-gnutls-dev:i386
104104
tfc
105105
ts

‎lgsm/functions/alert_telegram.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ json=$(cat <<EOF
1212
"chat_id": "${telegramchatid}",
1313
"parse_mode": "HTML",
1414
"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
15-
"disable_web_page_preview": "yes",
15+
"disable_web_page_preview": "yes"
16+
}
1617
EOF
1718
)
1819

‎lgsm/functions/check_deps.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ fn_check_loop(){
223223
# Checks if dependency is installed or not.
224224
fn_deps_detector(){
225225
## Check.
226-
# SteamCMD: Will be removed from required array if non-free repo is not available.
226+
# SteamCMD: Will be removed from required array if no appid is present or non-free repo is not available.
227227
# This will cause SteamCMD to be installed using tar.
228-
if [ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
228+
if [ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
229229
array_deps_required=( "${array_deps_required[@]/steamcmd}" )
230230
steamcmdstatus=1
231231
# Java: Added for users using Oracle JRE to bypass check.
@@ -313,7 +313,7 @@ fi
313313
info_distro.sh
314314

315315
if [ ! -f "${tmpdir}/dependency-no-check.tmp" ]&&[ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
316-
# Check that the disto dependency csv file exists.
316+
# Check that the distro dependency csv file exists.
317317
fn_check_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv"
318318
if [ -n "${checkflag}" ]&&[ "${checkflag}" == "0" ]; then
319319
fn_fetch_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" "lgsm/data" "chmodx" "norun" "noforce" "nohash"

0 commit comments

Comments
 (0)