Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'develop' into feature/onset
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgibbs64
dgibbs64 committed Mar 6, 2020
2 parents 5e8e905 + 9f91d4e commit 1f51796
Show file tree
Hide file tree
Showing 130 changed files with 279 additions and 200 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
View file
Expand Up @@ -24,20 +24,21 @@ addons:
- libcurl4-openssl-dev
- libdw-dev
- cmake
- steamcmd

jobs:
include:
- stage: "Jobs"
name: "code coverage"
script: bash tests/tests_kcov.sh; kcov --bash-method=DEBUG coverage tests/tests_mcserver.sh
- script: bash tests/tests_mcserver.sh
name: "Minecraft"
- script: bash tests/tests_jc2server.sh
name: "Minecraft"
- script: bash tests/tests_jc2server.sh
name: "Just Cause 2"
- script: bash tests/tests_fctrserver.sh
name: "Factorio"
name: "Factorio"
- script: bash tests/tests_ts3server.sh
name: "Teamspeak 3"
name: "Teamspeak 3"
- script: bash tests/tests_defaultcfg/tests_defaultcfg.sh
name: "_default.cfg checks"
after_success:
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/ahl2server/_default.cfg
View file
Expand Up @@ -42,7 +42,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/ahlserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/arkserver/_default.cfg
View file
Expand Up @@ -39,7 +39,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/arma3server/_default.cfg
View file
Expand Up @@ -53,7 +53,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bb2server/_default.cfg
View file
Expand Up @@ -43,7 +43,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bbserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bdserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bf1942server/_default.cfg
View file
Expand Up @@ -30,7 +30,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
View file
Expand Up @@ -43,7 +43,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/boserver/_default.cfg
View file
Expand Up @@ -36,7 +36,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bsserver/_default.cfg
View file
Expand Up @@ -47,7 +47,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/bt1944server/_default.cfg
View file
Expand Up @@ -35,7 +35,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/btserver/_default.cfg
View file
Expand Up @@ -30,7 +30,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/ccserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/cod2server/_default.cfg
View file
Expand Up @@ -36,7 +36,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/cod4server/_default.cfg
View file
Expand Up @@ -36,7 +36,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/codserver/_default.cfg
View file
Expand Up @@ -36,7 +36,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/coduoserver/_default.cfg
View file
Expand Up @@ -36,7 +36,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/codwawserver/_default.cfg
View file
Expand Up @@ -36,7 +36,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/csczserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/csgoserver/_default.cfg
View file
Expand Up @@ -63,7 +63,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/csserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/cssserver/_default.cfg
View file
Expand Up @@ -43,7 +43,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/dabserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/dmcserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/dodserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/dodsserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
4 changes: 2 additions & 2 deletions lgsm/config-default/config-lgsm/doiserver/_default.cfg
View file
Expand Up @@ -19,7 +19,7 @@ tickrate="64"

## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
fn_parms(){
parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -workshop"
parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -workshop -norestart"
}

#### LinuxGSM Settings ####
Expand All @@ -39,7 +39,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/dstserver/_default.cfg
View file
Expand Up @@ -41,7 +41,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/dysserver/_default.cfg
View file
Expand Up @@ -43,7 +43,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/ecoserver/_default.cfg
View file
Expand Up @@ -30,7 +30,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/emserver/_default.cfg
View file
Expand Up @@ -43,7 +43,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/etlserver/_default.cfg
View file
Expand Up @@ -30,7 +30,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/fctrserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/fofserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/gesserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/gmodserver/_default.cfg
View file
Expand Up @@ -54,7 +54,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/hldmserver/_default.cfg
View file
Expand Up @@ -37,7 +37,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down
2 changes: 1 addition & 1 deletion lgsm/config-default/config-lgsm/hldmsserver/_default.cfg
View file
Expand Up @@ -38,7 +38,7 @@ displayip=""
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
posttarget="https://termbin.com"

# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
Expand Down

0 comments on commit 1f51796

Please sign in to comment.