Skip to content

Commit c5c0259

Browse files
dgibbs64dgibbs64
committed
Merge remote-tracking branch 'h3o66/feature/notication-config-split' into feature/notication-config-split
2 parents 89e7f60 + dacc33e commit c5c0259

19 files changed

+358
-91
lines changed

‎.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Set update schedule for GitHub Actions
2+
version: 2
3+
updates:
4+
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
# Check for updates to GitHub Actions every weekday
9+
interval: "daily"

‎.github/workflows/create-release.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@ on:
55
# branches to consider in the event; optional, defaults to all
66
branches:
77
- master
8+
permissions:
9+
contents: read
10+
811
jobs:
912
update_release_draft:
13+
permissions:
14+
contents: write # for release-drafter/release-drafter to create a github release
15+
pull-requests: write # for release-drafter/release-drafter to add label to PR
1016
runs-on: ubuntu-latest
1117
steps:
1218
# Drafts your next Release notes as Pull Requests are merged into "master"
13-
- uses: release-drafter/release-drafter@v5.15.0
19+
- uses: release-drafter/release-drafter@v5.19.0
1420
with:
1521
config-name: release-drafter.yml
1622
env:

‎.github/workflows/git-sync.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
GitHub-to-Bitbucket:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: webfactory/ssh-agent@v0.5.3
14-
uses: webfactory/ssh-agent@v0.5.3
13+
- name: webfactory/ssh-agent@v0.5.4
14+
uses: webfactory/ssh-agent@v0.5.4
1515
with:
1616
ssh-private-key: ${{ secrets.BITBUCKET_SECRET }}
1717

‎.github/workflows/labeler.yml

+6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ on:
33
issues:
44
types: [opened, edited]
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
triage:
11+
permissions:
12+
contents: read # for github/issue-labeler to get repo contents
13+
issues: write # for github/issue-labeler to create or remove labels
814
runs-on: ubuntu-latest
915
steps:
1016
- uses: github/issue-labeler@v2.4

‎.github/workflows/lock.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@ on:
44
schedule:
55
- cron: '0 0 * * *'
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
lock:
12+
permissions:
13+
issues: write # for dessant/lock-threads to lock issues
14+
pull-requests: write # for dessant/lock-threads to lock PRs
915
runs-on: ubuntu-latest
1016
steps:
11-
- uses: dessant/lock-threads@v2.1.2
17+
- uses: dessant/lock-threads@v3
1218
with:
1319
github-token: ${{ secrets.GITHUB_TOKEN }}
14-
issue-lock-comment: >
20+
issue-comment: >
1521
This issue has been automatically locked since there
1622
has not been any recent activity after it was closed.
1723
Please open a new issue for related bugs.
18-
pr-lock-comment: >
24+
pr-comment: >
1925
This pull request has been automatically locked since there
2026
has not been any recent activity after it was closed.
2127
Please open a new issue for related bugs.

‎.github/workflows/version-check.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ name: Version Check
77
on: push
88

99
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
# This workflow contains a single job called "build"
1215
Version-Check:
@@ -16,7 +19,7 @@ jobs:
1619
# Steps represent a sequence of tasks that will be executed as part of the job
1720
steps:
1821
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
19-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2023

2124
# Runs a single command using the runners shell
2225
- name: compare versions

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ servermods=""
3232
bepath=""
3333

3434
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
35-
startparameters="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
35+
startparameters="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod='${mods}' -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
36+
3637
## Monitor | https://docs.linuxgsm.com/commands/monitor
3738
# Query delay time
3839
querydelay="5"

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

+2-5
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
ip="0.0.0.0"
1713
port="27015"
@@ -28,7 +24,8 @@ serverpassword=""
2824
# -password \"${serverpassword}\"
2925

3026
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
31-
startparameters="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
27+
startparameters="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods2 \"${mods}\""
28+
3229
## Monitor | https://docs.linuxgsm.com/commands/monitor
3330
# Query delay time
3431
querydelay="1"

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ stopmode="8"
4545
# 3: gamedig
4646
# 4: gsquery
4747
# 5: tcp
48-
querymode="2"
48+
querymode="5"
4949
querytype="protocol-valve"
5050

5151
## Console type

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ defaultmap="dustbowl"
1616
maxplayers="16"
1717

1818
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
19-
startparameters="-game tfc -strictportbind _ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
19+
startparameters="-game tfc -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
20+
2021
## Monitor | https://docs.linuxgsm.com/commands/monitor
2122
# Query delay time
2223
querydelay="1"

‎lgsm/data/debian-11.csv

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pmc,openjdk-17-jre
7878
pstbs,libgconf-2-4
7979
pvkii
8080
pvr,libc++1
81-
pz,openjdk-16-jre,rng-tools
81+
pz,openjdk-17-jre,rng-tools
8282
q2
8383
q3
8484
ql
@@ -87,7 +87,7 @@ ricochet
8787
ro
8888
rtcw
8989
rust,lib32z1
90-
rw,openjdk-16-jre
90+
rw,openjdk-17-jre
9191
samp
9292
sb
9393
sbots

‎lgsm/data/serverlist.csv

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ ns2c,ns2cserver,NS2: Combat
7272
onset,onsetserver,Onset
7373
opfor,opforserver,Opposing Force
7474
pc,pcserver,Project Cars
75+
pc2,pc2server,Project Cars 2
7576
pmc,pmcserver,PaperMC
7677
pstbs,pstbsserver,Post Scriptum: The Bloody Seventh
7778
pvkii,pvkiiserver,Pirates Vikings & Knights II

0 commit comments

Comments
 (0)