Skip to content

Commit 157533c

Browse files
dgibbs64dgibbs64
committed
Merge branch 'release/v21.1.0'
2 parents 3fa9376 + 25d344f commit 157533c

File tree

262 files changed

+2475
-1115
lines changed

Some content is hidden

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

262 files changed

+2475
-1115
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ steampass='password'
1515
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
1616

1717
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
18-
fn_parms(){
19-
parms="-c ${servercfgfullpath}"
20-
}
18+
startparameters="-c ${servercfgfullpath}"
2119

2220
#### LinuxGSM Settings ####
2321

@@ -112,6 +110,7 @@ sleeptime="0.5"
112110
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
113111
# Server appid
114112
appid="302550"
113+
steamcmdforcewindows="yes"
115114
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
116115
branch=""
117116
betapassword=""

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ defaultmap="act_airport"
2121
maxplayers="20"
2222

2323
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
24-
fn_parms(){
25-
parms="-game ahl2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
26-
}
24+
startparameters="-game ahl2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
2725

2826
#### LinuxGSM Settings ####
2927

@@ -115,6 +113,16 @@ ansi="on"
115113
## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
116114
sleeptime="0.5"
117115

116+
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
117+
# Server appid
118+
appid="985050"
119+
steamcmdforcewindows="no"
120+
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
121+
branch=""
122+
betapassword=""
123+
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
124+
steammaster="true"
125+
118126
## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
119127
# 1: tmux kill
120128
# 2: CTRL+c
@@ -138,14 +146,6 @@ stopmode="3"
138146
querymode="2"
139147
querytype="protocol-valve"
140148

141-
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
142-
# Server appid
143-
appid="985050"
144-
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
145-
branch=""
146-
betapassword=""
147-
# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
148-
steammaster="true"
149149

150150
## Console type
151151
consoleverbose="yes"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ defaultmap="ahl_hydro"
1616
maxplayers="16"
1717

1818
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
19-
fn_parms(){
20-
parms="-game action -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} "
21-
}
19+
startparameters="-game action -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} "
2220

2321
#### LinuxGSM Settings ####
2422

@@ -113,6 +111,7 @@ sleeptime="0.5"
113111
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
114112
# Server appid
115113
appid="90"
114+
steamcmdforcewindows="no"
116115
appidmod="cstrike"
117116
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
118117
branch=""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ altsavedirectoryname="${defaultmap}"
1919
maxplayers="70"
2020

2121
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
22-
fn_parms(){
23-
parms="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${ip}"
24-
}
22+
startparameters="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${ip}"
2523

2624
#### LinuxGSM Settings ####
2725

@@ -116,6 +114,7 @@ sleeptime="0.5"
116114
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
117115
# Server appid
118116
appid="376030"
117+
steamcmdforcewindows="no"
119118
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
120119
branch=""
121120
betapassword=""

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ servermods=""
3232
bepath=""
3333

3434
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
35-
fn_parms(){
36-
parms="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
37-
}
35+
startparameters="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
3836

3937
#### LinuxGSM Settings ####
4038

@@ -129,6 +127,7 @@ sleeptime="0.5"
129127
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
130128
# Server appid
131129
appid="233780"
130+
steamcmdforcewindows="no"
132131
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
133132
branch=""
134133
betapassword=""
@@ -174,7 +173,7 @@ glibc="2.13"
174173
## Game Server Directories
175174
systemdir="${serverfiles}"
176175
executabledir="${serverfiles}"
177-
executable="./arma3server"
176+
executable="./arma3server_64"
178177
servercfgdir="${systemdir}/cfg"
179178
servercfg="${selfname}.server.cfg"
180179
servercfgdefault="server.cfg"

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
port="27000"
1313
# https://steamidfinder.com
1414
adminsteamid=""
15-
16-
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
17-
fn_parms(){
18-
if [ ! -z "${adminsteamid}" ]; then
15+
if [ -n "${adminsteamid}" ]; then
1916
admincmd="--admin ${adminsteamid}"
2017
fi
21-
parms="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}"
22-
}
18+
19+
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
20+
startparameters="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}"
2321

2422
#### LinuxGSM Settings ####
2523

@@ -28,6 +26,7 @@ parms="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}
2826
# https://docs.linuxgsm.com/configuration/linuxgsm-stats
2927
# (on|off)
3028
stats="off"
29+
3130
## Notification Alerts
3231
# (on|off)
3332

@@ -109,9 +108,11 @@ ansi="on"
109108

110109
## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
111110
sleeptime="0.5"
111+
112112
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
113113
# Server appid
114114
appid="565060"
115+
steamcmdforcewindows="no"
115116
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
116117
branch=""
117118
betapassword=""
@@ -141,6 +142,10 @@ stopmode="10"
141142
querymode="5"
142143
querytype=""
143144

145+
## Console type
146+
consoleverbose="yes"
147+
consoleinteract="yes"
148+
144149
## Game Server Details
145150
# Do not edit
146151
gamename="Avorion"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ maxplayers="20"
2222
gslt=""
2323

2424
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
25-
fn_parms(){
26-
parms="-game brainbread2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
27-
}
25+
startparameters="-game brainbread2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
2826

2927
#### LinuxGSM Settings ####
3028

@@ -119,6 +117,7 @@ sleeptime="0.5"
119117
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
120118
# Server appid
121119
appid="475370"
120+
steamcmdforcewindows="no"
122121
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
123122
branch=""
124123
betapassword=""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ defaultmap="bb_chp4_slaywatch"
1616
maxplayers="16"
1717

1818
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
19-
fn_parms(){
20-
parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
21-
}
19+
startparameters="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
2220

2321
#### LinuxGSM Settings ####
2422

@@ -113,6 +111,7 @@ sleeptime="0.5"
113111
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
114112
# Server appid
115113
appid="90"
114+
steamcmdforcewindows="no"
116115
appidmod="cstrike"
117116
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
118117
branch=""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ defaultmap="pve_tomb"
1616
maxplayers="3"
1717

1818
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
19-
fn_parms(){
20-
parms="-game bdef -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
21-
}
19+
startparameters="-game bdef -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
2220

2321
#### LinuxGSM Settings ####
2422

@@ -113,6 +111,7 @@ sleeptime="0.5"
113111
## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
114112
# Server appid
115113
appid="817300"
114+
steamcmdforcewindows="no"
116115
# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
117116
branch=""
118117
betapassword=""

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#### Game Server Settings ####
1010

1111
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
12-
fn_parms(){
13-
parms="+hostServer 1 +dedicated 1"
14-
}
12+
startparameters="+hostServer 1 +dedicated 1"
1513

1614
#### LinuxGSM Settings ####
1715

0 commit comments

Comments
 (0)