Skip to content

Commit 21277aa

Browse files
dgibbs64dgibbs64
committed
Merge branch 'release/v22.1.0'
2 parents f78d707 + f34bae8 commit 21277aa

Some content is hidden

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

44 files changed

+656
-105
lines changed

‎.github/workflows/create-release.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ 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"

‎.github/workflows/labeler.yml‎

Lines changed: 6 additions & 0 deletions
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/[email protected]

‎.github/workflows/lock.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@ 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:
1117
- uses: dessant/lock-threads@v3

‎.github/workflows/version-check.yml‎

Lines changed: 3 additions & 0 deletions
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:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ consoleinteract="no"
158158
# Do not edit
159159
gamename="ARK: Survival Evolved"
160160
engine="unreal4"
161-
glibc="2.15"
161+
glibc="2.17"
162162

163163
#### Directories ####
164164
# Edit with care

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ 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"
3636

3737
#### LinuxGSM Settings ####
3838

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

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
1212
startparameters=""
1313

14+
# Version (latest|1.18.33.02)
15+
mcversion="latest"
16+
1417
#### LinuxGSM Settings ####
1518

1619
## LinuxGSM Stats

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

Lines changed: 1 addition & 5 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
ip="0.0.0.0"
1713
port="27015"
@@ -28,7 +24,7 @@ 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}\""
3228

3329
#### LinuxGSM Settings ####
3430

0 commit comments

Comments
 (0)