gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'refs/remotes/origin/master' into development

pull/832/head
Daniel Gibbs 9 years ago
parent
1d112401cd 21be3ad81e
commit
13e965daa9
56 changed files with 106 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      7DaysToDie/sdtdserver
  2. 2
      Arma3/arma3server
  3. 2
      BlackMesa/bmdmserver
  4. 2
      BladeSymphony/bsserver
  5. 2
      BrainBread2/bb2server
  6. 2
      CodenameCURE/ccserver
  7. 2
      CounterStrike/csserver
  8. 2
      CounterStrikeConditionZero/csczserver
  9. 2
      CounterStrikeGlobalOffensive/csgoserver
  10. 2
      CounterStrikeSource/cssserver
  11. 2
      DayOfDefeat/dodserver
  12. 2
      DayOfDefeatSource/dodsserver
  13. 2
      DeathmatchClassic/dmcserver
  14. 2
      DontStarveTogether/dstserver
  15. 2
      DoubleActionBoogaloo/dabserver
  16. 2
      FistfulOfFrags/fofserver
  17. 2
      GarrysMod/gmodserver
  18. 2
      GoldenEyeSource/gesserver
  19. 2
      HalfLife2Deathmatch/hl2dmserver
  20. 2
      HalfLifeDeathmatch/hldmserver
  21. 2
      HalfLifeDeathmatchSource/hldmsserver
  22. 2
      Hurtworld/hwserver
  23. 4
      Insurgency/insserver
  24. 2
      JustCause2/jc2server
  25. 2
      KillingFloor/kfserver
  26. 2
      Left4Dead/l4dserver
  27. 2
      Left4Dead2/l4d2server
  28. 2
      Mumble/mumbleserver
  29. 2
      NS2Combat/ns2cserver
  30. 2
      NaturalSelection2/ns2server
  31. 2
      NoMoreRoomInHell/nmrihserver
  32. 2
      OpposingForce/opforserver
  33. 2
      PiratesVikingandKnightsII/pvkiiserver
  34. 2
      ProjectZomboid/pzserver
  35. 2
      QuakeLive/qlserver
  36. 2
      RedOrchestra/roserver
  37. 2
      Ricochet/ricochetserver
  38. 2
      Rust/rustserver
  39. 2
      SeriousSam3BFE/ss3sserver
  40. 2
      StarBound/sbserver
  41. 2
      SvenCoop/svencoopserver
  42. 2
      TeamFortress2/tf2server
  43. 2
      TeamFortressClassic/tfcserver
  44. 2
      TeamSpeak3/ts3server
  45. 2
      Teeworlds/twserver
  46. 2
      Terraria/terrariaserver
  47. 2
      UnrealTournament2004/ut2k4server
  48. 2
      UnrealTournament99/ut99server
  49. 11
      functions/core_functions.sh
  50. 15
      functions/update_functions.sh
  51. 10
      lgsm/functions/alert.sh
  52. 2
      lgsm/functions/command_monitor.sh
  53. 31
      lgsm/functions/command_stop.sh
  54. 2
      lgsm/functions/install_gsquery.sh
  55. 4
      lgsm/functions/logs.sh
  56. 8
      lgsm/functions/monitor_gsquery.sh

2
7DaysToDie/sdtdserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Arma3/arma3server
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
BlackMesa/bmdmserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
BladeSymphony/bsserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
BrainBread2/bb2server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
CodenameCURE/ccserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
CounterStrike/csserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
CounterStrikeConditionZero/csczserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
CounterStrikeGlobalOffensive/csgoserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
CounterStrikeSource/cssserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
DayOfDefeat/dodserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
DayOfDefeatSource/dodsserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
DeathmatchClassic/dmcserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
DontStarveTogether/dstserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
DoubleActionBoogaloo/dabserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
FistfulOfFrags/fofserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
GarrysMod/gmodserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
GoldenEyeSource/gesserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
HalfLife2Deathmatch/hl2dmserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
HalfLifeDeathmatch/hldmserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
HalfLifeDeathmatchSource/hldmsserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Hurtworld/hwserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

4
Insurgency/insserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login
@ -71,7 +71,7 @@ functionsdir="${lgsmdir}/functions"
filesdir="${rootdir}/serverfiles" filesdir="${rootdir}/serverfiles"
systemdir="${filesdir}/insurgency" systemdir="${filesdir}/insurgency"
executabledir="${filesdir}" executabledir="${filesdir}"
executable="./srcds_linux" executable="./srcds_run"
servercfg="${servicename}.cfg" servercfg="${servicename}.cfg"
servercfgdir="${systemdir}/cfg" servercfgdir="${systemdir}/cfg"
servercfgfullpath="${servercfgdir}/${servercfg}" servercfgfullpath="${servercfgdir}/${servercfg}"

2
JustCause2/jc2server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
KillingFloor/kfserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Left4Dead/l4dserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Left4Dead2/l4d2server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Pushover # Pushover

2
Mumble/mumbleserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Server Details # Server Details

2
NS2Combat/ns2cserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
NaturalSelection2/ns2server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
NoMoreRoomInHell/nmrihserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
OpposingForce/opforserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
PiratesVikingandKnightsII/pvkiiserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
ProjectZomboid/pzserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
QuakeLive/qlserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
RedOrchestra/roserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Ricochet/ricochetserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Rust/rustserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login (not required) # Steam login (not required)

2
SeriousSam3BFE/ss3sserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
StarBound/sbserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
SvenCoop/svencoopserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
TeamFortress2/tf2server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
TeamFortressClassic/tfcserver
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
TeamSpeak3/ts3server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Start Variables # Start Variables

2
Teeworlds/twserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
Terraria/terrariaserver
View File

@ -23,7 +23,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Steam login # Steam login

2
UnrealTournament2004/ut2k4server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Start Variables # Start Variables

2
UnrealTournament99/ut99server
View File

@ -22,7 +22,7 @@ email="[email protected]"
# Pushbullet # Pushbullet
# https://www.pushbullet.com/#settings # https://www.pushbullet.com/#settings
pushbulletalert"off" pushbulletalert="off"
pushbullettoken="accesstoken" pushbullettoken="accesstoken"
# Start Variables # Start Variables

11
functions/core_functions.sh
View File

@ -14,6 +14,15 @@ if [ -z "${lgsmdir}" ]; then
fi fi
fn_fetch_core_dl(){ fn_fetch_core_dl(){
if [ -z "${githubuser}" ]; then
githubuser="dgibbs64"
fi
if [ -z "${githubrepo}" ]; then
githubrepo="linuxgsm"
fi
if [ -z "${githubbranch}" ]; then
githubbranch="master"
fi
github_file_url_dir="lgsm/functions" github_file_url_dir="lgsm/functions"
github_file_url_name="${functionfile}" github_file_url_name="${functionfile}"
filedir="${functionsdir}" filedir="${functionsdir}"
@ -60,4 +69,4 @@ functionfile="${FUNCNAME}"
fn_fetch_core_dl fn_fetch_core_dl
} }
core_functions.sh core_functions.sh

15
functions/update_functions.sh
View File

@ -0,0 +1,15 @@
#!/bin/bash
# LGSM fn_update_functions function
# Author: Daniel Gibbs
# Website: https://gameservermanagers.com
lgsm_version="210516"
# Description: REDIRECT FUNCTION to new command_update_functions.sh
command_update_functions.sh(){
functionfile="${FUNCNAME}"
fn_runfunction
}
command_update_functions.sh

10
lgsm/functions/alert.sh
View File

@ -8,7 +8,7 @@ lgsm_version="210516"
fn_alert_test(){ fn_alert_test(){
fn_scriptlog "Sending test alert" fn_scriptlog "Sending test alert"
alertsubject="LGSM - Alert Check - ${servername}" alertsubject="LGSM - Test Alert - ${servername}"
alertbody="LGSM test alert, how you read?" alertbody="LGSM test alert, how you read?"
} }
@ -21,13 +21,13 @@ fn_alert_restart(){
fn_alert_restart_query(){ fn_alert_restart_query(){
fn_scriptlog "Sending restart alert: ${gsquerycmd}" fn_scriptlog "Sending restart alert: ${gsquerycmd}"
alertsubject="LGSM - Restarted - ${servername}" alertsubject="LGSM - Restarted - ${servername}"
alertbody="Failed to Query: ${gsquerycmd}" alertbody="gsquery.py failed to query: ${gsquerycmd}"
} }
fn_alert_update(){ fn_alert_update(){
fn_scriptlog "Sending update alert" fn_scriptlog "Sending update alert"
alertsubject="LGSM - Updated - ${servername}" alertsubject="LGSM - Updated - ${servername}"
alertbody="${servicename} Recieved update" alertbody="${servicename} recieved update"
} }
if [ "${alert}" == "restart" ]; then if [ "${alert}" == "restart" ]; then
@ -43,7 +43,7 @@ fi
if [ "${emailnotification}" == "on" ]||[ "${emailalert}" == "on" ]&&[ -n "${email}" ]; then if [ "${emailnotification}" == "on" ]||[ "${emailalert}" == "on" ]&&[ -n "${email}" ]; then
alert_email.sh alert_email.sh
elif [ "${emailnotification}" != "on" ]||[ "${emailalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then elif [ "${emailnotification}" != "on" ]||[ "${emailalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
fn_print_fail_nl "Alerts not enabled" fn_print_info_nl "Email alerts not enabled"
fn_scriptlog "Email alerts not enabled" fn_scriptlog "Email alerts not enabled"
elif [ -z "${email}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then elif [ -z "${email}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
fn_print_fail_nl "Email no set" fn_print_fail_nl "Email no set"
@ -53,7 +53,7 @@ fi
if [ "${pushbulletalert}" == "on" ]&&[ -n "${pushbullettoken}" ]; then if [ "${pushbulletalert}" == "on" ]&&[ -n "${pushbullettoken}" ]; then
alert_pushbullet.sh alert_pushbullet.sh
elif [ "${pushbulletalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then elif [ "${pushbulletalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
fn_print_fail_nl "Pushbullet alerts not enabled" fn_print_info_nl "Pushbullet alerts not enabled"
fn_scriptlog "Pushbullet alerts not enabled" fn_scriptlog "Pushbullet alerts not enabled"
elif [ -z "${pushbullettoken}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then elif [ -z "${pushbullettoken}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
fn_print_fail_nl "Pushbullet token not set" fn_print_fail_nl "Pushbullet token not set"

2
lgsm/functions/command_monitor.sh
View File

@ -66,7 +66,7 @@ fn_monitor_tmux(){
local allowed_engines_array=( avalanche goldsource realvirtuality source spark unity3d unreal unreal2 ) local allowed_engines_array=( avalanche goldsource realvirtuality source spark unity3d unreal unreal2 )
for allowed_engine in "${allowed_engines_array[@]}" for allowed_engine in "${allowed_engines_array[@]}"
do do
if [ "${allowed_engine}" == "${function_selfname}" ]; then if [ "${allowed_engine}" == "${engine}" ]; then
monitor_gsquery.sh monitor_gsquery.sh
fi fi
done done

31
lgsm/functions/command_stop.sh
View File

@ -17,8 +17,8 @@ fn_stop_graceful_source(){
tmux send -t "${servicename}" quit ENTER > /dev/null 2>&1 tmux send -t "${servicename}" quit ENTER > /dev/null 2>&1
# waits up to 30 seconds giving the server time to shutdown gracefuly # waits up to 30 seconds giving the server time to shutdown gracefuly
for seconds in {1..30}; do for seconds in {1..30}; do
pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -Ec "^${servicename}:") check_status.sh
if [ "${pid}" == "0" ]; then if [ "${status}" == "0" ]; then
fn_print_ok "Graceful: rcon quit: ${seconds}: " fn_print_ok "Graceful: rcon quit: ${seconds}: "
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_scriptlog "Graceful: rcon quit: OK: ${seconds} seconds" fn_scriptlog "Graceful: rcon quit: OK: ${seconds} seconds"
@ -27,7 +27,8 @@ fn_stop_graceful_source(){
sleep 1 sleep 1
fn_print_dots "Graceful: rcon quit: ${seconds}" fn_print_dots "Graceful: rcon quit: ${seconds}"
done done
if [ "${pid}" != "0" ]; then check_status.sh
if [ "${status}" != "0" ]; then
fn_print_fail "Graceful: rcon quit: " fn_print_fail "Graceful: rcon quit: "
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_scriptlog "Graceful: rcon quit: FAIL" fn_scriptlog "Graceful: rcon quit: FAIL"
@ -202,11 +203,17 @@ fn_stop_teamspeak3(){
fn_scriptlog "${servername}" fn_scriptlog "${servername}"
sleep 1 sleep 1
${filesdir}/ts3server_startscript.sh stop > /dev/null 2>&1 ${filesdir}/ts3server_startscript.sh stop > /dev/null 2>&1
# Remove lock file check_status.sh
rm -f "${rootdir}/${lockselfname}" if [ "${status}" == "0" ]; then
fn_print_ok_nl "${servername}" # Remove lock file
fn_scriptlog "Stopped ${servername}" rm -f "${rootdir}/${lockselfname}"
} fn_print_ok_nl "${servername}"
fn_scriptlog "Stopped ${servername}"
else
fn_print_fail_nl "Unable to stop${servername}"
fn_scriptlog "Unable to stop${servername}"
fi
}
fn_stop_tmux(){ fn_stop_tmux(){
fn_print_dots "${servername}" fn_print_dots "${servername}"
@ -215,8 +222,8 @@ fn_stop_tmux(){
# Kill tmux session # Kill tmux session
tmux kill-session -t "${servicename}" > /dev/null 2>&1 tmux kill-session -t "${servicename}" > /dev/null 2>&1
sleep 0.5 sleep 0.5
pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -Ec "^${servicename}:") check_status.sh
if [ "${pid}" == "0" ]; then if [ "${status}" == "0" ]; then
# Remove lock file # Remove lock file
rm -f "${rootdir}/${lockselfname}" rm -f "${rootdir}/${lockselfname}"
# ARK doesn't clean up immediately after tmux is killed. # ARK doesn't clean up immediately after tmux is killed.
@ -244,8 +251,8 @@ fn_stop_pre_check(){
fn_stop_teamspeak3 fn_stop_teamspeak3
fi fi
else else
pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -Ec "^${servicename}:") check_status.sh
if [ "${pid}" == "0" ]; then if [ "${status}" == "0" ]; then
fn_print_ok_nl "${servername} is already stopped" fn_print_ok_nl "${servername} is already stopped"
fn_scriptlog "${servername} is already stopped" fn_scriptlog "${servername} is already stopped"
else else

2
lgsm/functions/install_gsquery.sh
View File

@ -5,7 +5,7 @@
lgsm_version="210516" lgsm_version="210516"
fn_dlgsquery(){ fn_dlgsquery(){
cd "${rootdir}" cd "${functionsdir}"
echo -e "downloading gsquery.py...\c" echo -e "downloading gsquery.py...\c"
wget -N /dev/null "https://gameservermanagers.com/dl/gsquery.py" 2>&1 | grep -F "HTTP" | grep -v "Moved Permanently" | cut -c45- | uniq wget -N /dev/null "https://gameservermanagers.com/dl/gsquery.py" 2>&1 | grep -F "HTTP" | grep -v "Moved Permanently" | cut -c45- | uniq
chmod +x gsquery.py chmod +x gsquery.py

4
lgsm/functions/logs.sh
View File

@ -17,9 +17,9 @@ if [ -n "${consolelog}" ]; then
fi fi
# For games not displaying a console, and having logs into their game folder # For games not displaying a console, and having logs into their game folder
if [ -n "${gamelogfile}" ]; then if [ "${function_selfname}" == "command_start.sh" ] && [ -n "${gamelogfile}" ]; then
if [ -n "$(find "${systemdir}" -name "gamelog*.log")" ]; then if [ -n "$(find "${systemdir}" -name "gamelog*.log")" ]; then
fn_printinfo "Moving game logs to ${gamelogdir}" fn_print_info "Moving game logs to ${gamelogdir}"
fn_scriptlog "Moving game logs to ${gamelogdir}" fn_scriptlog "Moving game logs to ${gamelogdir}"
echo -en "\n" echo -en "\n"
sleep 1 sleep 1

8
lgsm/functions/monitor_gsquery.sh
View File

@ -9,7 +9,7 @@ lgsm_version="210516"
local modulename="Monitor" local modulename="Monitor"
# Forces legecy servers to use gsquery as vat gsquery is not present in legecy # Forces legecy servers to use gsquery
if [ -z "${gsquery}" ]; then if [ -z "${gsquery}" ]; then
gsquery="yes" gsquery="yes"
fi fi
@ -29,7 +29,7 @@ if [ "${gsquery}" == "yes" ]; then
port=$((port + 1)) port=$((port + 1))
fi fi
if [ -z "${queryport}" ]; then if [ -n "${queryport}" ]; then
port="${queryport}" port="${queryport}"
fi fi
@ -46,14 +46,14 @@ if [ "${gsquery}" == "yes" ]; then
fn_print_querying_eol fn_print_querying_eol
fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : QUERYING" fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : QUERYING"
gsquerycmd=$("${functionsdir}"/gsquery.py -a "${ip}" -p 1 -e "${engine}" 2>&1) gsquerycmd=$("${functionsdir}"/gsquery.py -a "${ip}" -p "${port}" -e "${engine}" 2>&1)
exitcode=$? exitcode=$?
sleep 1 sleep 1
if [ "${exitcode}" == "0" ]; then if [ "${exitcode}" == "0" ]; then
# Server OK # Server OK
fn_print_ok "Querying port: ${ip}:${port} : ${queryattempt} : " fn_print_ok "Querying port: ${ip}:${port} : ${queryattempt} : "
fn_print_ok_eol fn_print_ok_eol_nl
fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : OK" fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : OK"
sleep 1 sleep 1
exit exit

Write Preview
Loading…
Cancel
Save