Skip to content

Commit af5e9ba

Browse files
dgibbs64dgibbs64
authored
Merge branch 'develop' into master
2 parents 4981393 + 9a85063 commit af5e9ba

19 files changed

+352
-21
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ javaram="1024" # -Xmx$1024M
1414
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
1515
fn_parms(){
1616
parms="nogui"
17+
executable="java -Xmx${javaram}M -jar ${jarfile}"
1718
}
1819

1920
## Release Settings | https://docs.linuxgsm.com/game-servers/minecraft#release-settings
@@ -151,7 +152,8 @@ glibc="null"
151152
## Game Server Directories
152153
systemdir="${serverfiles}"
153154
executabledir="${serverfiles}"
154-
executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar"
155+
jarfile="${serverfiles}/minecraft_server.jar"
156+
executable="${jarfile}"
155157
servercfgdir="${systemdir}"
156158
servercfg="server.properties"
157159
servercfgdefault="server.properties"

‎lgsm/config-default/config-lgsm/secrets-common-template.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
##################################
2+
######## Common Secrets ##########
3+
##################################
4+
# PLACE GLOBAL SECRET SETTINGS HERE
5+
## These settings will apply to all instances.

‎lgsm/config-default/config-lgsm/secrets-instance-template.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
##################################
2+
####### Instance Secrets #########
3+
##################################
4+
# PLACE INSTANCE SECRET SETTINGS HERE
5+
## These settings will apply to a specific instance.

‎lgsm/data/serverlist.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ cod2,cod2server,Call of Duty 2
2121
cod4,cod4server,Call of Duty 4
2222
coduo,coduoserver,Call of Duty: United Offensive
2323
codwaw,codwawserver,Call of Duty: World at War
24+
col,colserver,Colony Survival
2425
cs,csserver,Counter-Strike 1.6
2526
cscz,csczserver,Counter-Strike: Condition Zero
2627
csgo,csgoserver,Counter-Strike: Global Offensive

‎lgsm/functions/check_deps.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,9 @@ fn_deps_build_debian(){
385385
# Battlefield 1942
386386
elif [ "${shortname}" == "bf1942" ]; then
387387
array_deps_required+=( libncurses5:i386 libtinfo5:i386 )
388+
# Black Mesa: Death Match
389+
elif [ "${shortname}" == "bmdm" ]; then
390+
array_deps_required+=( libncurses5:i386 )
388391
# Counter-Strike: Source, Garry's Mod, No More Room in Hell, Source Forts Classic, Zombie Master Reborn and Zombie Panic: Source
389392
elif [ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "nmrih" ]||[ "${shortname}" == "sfc" ]||[ "${shortname}" == "zmr" ]||[ "${shortname}" == "zps" ]; then
390393
if [ "${arch}" == "x86_64" ]; then
@@ -401,6 +404,9 @@ fn_deps_build_debian(){
401404
# Barotrauma
402405
elif [ "${shortname}" == "bt" ]; then
403406
array_deps_required+=( libicu-dev )
407+
# Colony Survival
408+
elif [ "${shortname}" == "col" ]; then
409+
array_deps_required+=( coreutils )
404410
# Ecoserver
405411
elif [ "${shortname}" == "eco" ]; then
406412
array_deps_required+=( libgdiplus )
@@ -501,15 +507,18 @@ fn_deps_build_redhat(){
501507
# Battlefield: Vietnam
502508
elif [ "${shortname}" == "bfv" ]; then
503509
array_deps_required+=( compat-libstdc++-33.i686 glibc.i686 )
504-
# Battlefield 1942, Counter-Strike: Source, Garry's Mod, No More Room in Hell, Source Forts Classic, Zombie Master Reborn and Zombie Panic: Source
505-
elif [ "${shortname}" == "bf1942" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "nmrih" ]||[ "${shortname}" == "sfc" ]||[ "${shortname}" == "zmr" ]||[ "${shortname}" == "zps" ]; then
510+
# Battlefield 1942, Black Mesa: Deathmatch, Counter-Strike: Source, Garry's Mod, No More Room in Hell, Source Forts Classic, Zombie Master Reborn and Zombie Panic: Source
511+
elif [ "${shortname}" == "bf1942" ]||[ "${shortname}" == "bmdm" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "nmrih" ]||[ "${shortname}" == "sfc" ]||[ "${shortname}" == "zmr" ]||[ "${shortname}" == "zps" ]; then
506512
array_deps_required+=( ncurses-libs.i686 )
507513
# Brainbread 2, Don't Starve Together & Team Fortress 2
508514
elif [ "${shortname}" == "bb2" ]||[ "${shortname}" == "dst" ]||[ "${shortname}" == "tf2" ]; then
509515
array_deps_required+=( libcurl.i686 )
510516
# Call of Duty & Medal of Honor: Allied Assault
511517
elif [ "${shortname}" == "cod" ]||[ "${shortname}" == "coduo" ]||[ "${shortname}" == "cod2" ]||[ "${shortname}" == "mohaa" ]; then
512518
array_deps_required+=( compat-libstdc++-33.i686 )
519+
# Colony Survival
520+
elif [ "${shortname}" == "col" ]; then
521+
array_deps_required+=( coreutils )
513522
# Ecoserver
514523
elif [ "${shortname}" == "eco" ]; then
515524
array_deps_required+=( libgdiplus )

‎lgsm/functions/command_stop.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn_stop_graceful_cmd(){
4343
fn_print_dots "Graceful: sending \"${1}\""
4444
fn_script_log_info "Graceful: sending \"${1}\""
4545
# Sends specific stop command.
46-
tmux send -t "${sessionname}" "${1}" ENTER > /dev/null 2>&1
46+
tmux send -t "${sessionname}" ENTER "${1}" ENTER > /dev/null 2>&1
4747
# Waits up to ${seconds} seconds giving the server time to shutdown gracefully.
4848
for ((seconds=1; seconds<=${2}; seconds++)); do
4949
check_status.sh

‎lgsm/functions/core_dl.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn_dl_steamcmd(){
6161
# If using a specific branch.
6262
if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
6363
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" -betapassword "${betapassword}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
64-
elif [ -n "${branch}" ]; then
64+
elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
6565
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" -beta "${branch}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
6666
else
6767
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
@@ -70,7 +70,7 @@ fn_dl_steamcmd(){
7070
elif [ "${shortname}" == "ac" ]||[ "${shortname}" == "jk2" ]; then
7171
if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
7272
${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" -betapassword "${betapassword}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
73-
elif [ -n "${branch}" ]; then
73+
elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
7474
${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
7575
else
7676
${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
@@ -79,7 +79,7 @@ fn_dl_steamcmd(){
7979
else
8080
if [ -n "${branch}" ]&&[ -n "${betapassword}" ]; then
8181
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" -betapassword "${betapassword}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
82-
elif [ -n "${branch}" ]; then
82+
elif [ -n "${branch}" ]&&[ "${branch}" != "public" ]; then
8383
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"
8484
else
8585
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${validate} +quit | uniq | tee -a "${lgsmlog}" "${steamcmdlog}"

‎lgsm/functions/core_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

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

10-
modulesversion="v20.6.1"
10+
modulesversion="v20.6.2"
1111

1212
# Core
1313

‎lgsm/functions/fix_steamcmd.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ elif [ "${shortname}" == "cmw" ]; then
7979
fn_fix_steamclient_so "32" "${executabledir}/lib"
8080
elif [ "${shortname}" == "cs" ]; then
8181
fn_fix_steamclient_so "32" "${serverfiles}"
82+
elif [ "${shortname}" == "col" ]; then
83+
fn_fix_steamclient_so "64" "${serverfiles}"
8284
elif [ "${shortname}" == "ins" ]; then
8385
fn_fix_steamclient_so "32" "${serverfiles}/bin"
8486
elif [ "${shortname}" == "pz" ]; then

0 commit comments

Comments
 (0)