Преглед изворни кода

notifications are now called alerts

Added pushbullet support to all servers
Daniel Gibbs пре 10 година
родитељ
комит
885d3b118b
65 измењених фајлова са 557 додато и 210 уклоњено
  1. 9 2
      7DaysToDie/sdtdserver
  2. 9 2
      ARKSurvivalEvolved/arkserver
  3. 9 2
      Arma3/arma3server
  4. 9 2
      BlackMesa/bmdmserver
  5. 9 2
      BladeSymphony/bsserver
  6. 9 2
      BrainBread2/bb2server
  7. 9 2
      CodenameCURE/ccserver
  8. 9 2
      CounterStrike/csserver
  9. 9 2
      CounterStrikeConditionZero/csczserver
  10. 9 2
      CounterStrikeGlobalOffensive/csgoserver
  11. 9 2
      CounterStrikeSource/cssserver
  12. 9 2
      DayOfDefeat/dodserver
  13. 9 2
      DayOfDefeatSource/dodsserver
  14. 9 2
      DeathmatchClassic/dmcserver
  15. 9 2
      DontStarveTogether/dstserver
  16. 9 2
      DoubleActionBoogaloo/dabserver
  17. 9 2
      FistfulOfFrags/fofserver
  18. 9 2
      GarrysMod/gmodserver
  19. 9 2
      GoldenEyeSource/gesserver
  20. 9 2
      HalfLife2Deathmatch/hl2dmserver
  21. 9 2
      HalfLifeDeathmatch/hldmserver
  22. 9 2
      HalfLifeDeathmatchSource/hldmsserver
  23. 9 2
      Hurtworld/hwserver
  24. 9 2
      Insurgency/insserver
  25. 9 2
      JustCause2/jc2server
  26. 9 2
      KillingFloor/kfserver
  27. 9 2
      Left4Dead/l4dserver
  28. 12 2
      Left4Dead2/l4d2server
  29. 9 2
      Mumble/mumbleserver
  30. 9 2
      NS2Combat/ns2cserver
  31. 9 2
      NaturalSelection2/ns2server
  32. 9 2
      NoMoreRoomInHell/nmrihserver
  33. 9 2
      OpposingForce/opforserver
  34. 9 2
      PiratesVikingandKnightsII/pvkiiserver
  35. 9 2
      ProjectZomboid/pzserver
  36. 9 2
      QuakeLive/qlserver
  37. 3 2
      README.md
  38. 9 2
      RedOrchestra/roserver
  39. 9 2
      Ricochet/ricochetserver
  40. 9 2
      Rust/rustserver
  41. 9 2
      SeriousSam3BFE/ss3sserver
  42. 9 2
      StarBound/sbserver
  43. 9 2
      SvenCoop/svencoopserver
  44. 9 2
      TeamFortress2/tf2server
  45. 9 2
      TeamFortressClassic/tfcserver
  46. 9 2
      TeamSpeak3/ts3server
  47. 9 2
      Teeworlds/twserver
  48. 9 2
      Terraria/terrariaserver
  49. 9 2
      UnrealTournament2004/ut2k4server
  50. 9 2
      UnrealTournament99/ut99server
  51. 15 0
      lgsm/functions/alert.sh
  52. 12 12
      lgsm/functions/alert_email.sh
  53. 14 0
      lgsm/functions/alert_pushbullet.sh
  54. 2 2
      lgsm/functions/check_deps.sh
  55. 0 22
      lgsm/functions/command_comms_check.sh
  56. 3 3
      lgsm/functions/command_details.sh
  57. 7 7
      lgsm/functions/command_monitor.sh
  58. 22 0
      lgsm/functions/command_test_alert.sh
  59. 0 15
      lgsm/functions/comms.sh
  60. 0 14
      lgsm/functions/comms_pushbullet.sh
  61. 5 5
      lgsm/functions/core_functions.sh
  62. 21 21
      lgsm/functions/core_getopt.sh
  63. 3 3
      lgsm/functions/monitor_gsquery.sh
  64. 3 3
      tests/tests_jc2server.sh
  65. 3 3
      tests/tests_ts3server.sh

+ 9 - 2
7DaysToDie/sdtdserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
ARKSurvivalEvolved/arkserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
Arma3/arma3server

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
BlackMesa/bmdmserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
BladeSymphony/bsserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
BrainBread2/bb2server

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
CodenameCURE/ccserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
CounterStrike/csserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
CounterStrikeConditionZero/csczserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
CounterStrikeGlobalOffensive/csgoserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
CounterStrikeSource/cssserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
DayOfDefeat/dodserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
DayOfDefeatSource/dodsserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
DeathmatchClassic/dmcserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
DontStarveTogether/dstserver

@@ -13,11 +13,18 @@ version="130516"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
DoubleActionBoogaloo/dabserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
FistfulOfFrags/fofserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
GarrysMod/gmodserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
GoldenEyeSource/gesserver

@@ -14,11 +14,18 @@ version="150316"
 #### Variables ####
 #### Variables ####
 export MALLOC_CHECK_=0
 export MALLOC_CHECK_=0
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
HalfLife2Deathmatch/hl2dmserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
HalfLifeDeathmatch/hldmserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
HalfLifeDeathmatchSource/hldmsserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
Hurtworld/hwserver

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
Insurgency/insserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
JustCause2/jc2server

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
KillingFloor/kfserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
Left4Dead/l4dserver

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 12 - 2
Left4Dead2/l4d2server

@@ -13,11 +13,21 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
+# Pushover
+#Push alot
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
Mumble/mumbleserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Server Details
 # Server Details
 gamename="Mumble"
 gamename="Mumble"
 servicename="mumble-server"
 servicename="mumble-server"

+ 9 - 2
NS2Combat/ns2cserver

@@ -13,11 +13,18 @@ version="220416"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
NaturalSelection2/ns2server

@@ -13,11 +13,18 @@ version="220416"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
NoMoreRoomInHell/nmrihserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
OpposingForce/opforserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
PiratesVikingandKnightsII/pvkiiserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
ProjectZomboid/pzserver

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
QuakeLive/qlserver

@@ -13,11 +13,18 @@ version="060516"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 3 - 2
README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/dgibbs64/linuxgsm.svg?branch=master)](https://travis-ci.org/dgibbs64/linuxgsm)
 [![Build Status](https://travis-ci.org/dgibbs64/linuxgsm.svg?branch=master)](https://travis-ci.org/dgibbs64/linuxgsm)
 [![Under Development](https://badge.waffle.io/dgibbs64/linuxgsm.svg?label=Under%20Development&title=Under%20Development)](http://waffle.io/dgibbs64/linuxgsm)
 [![Under Development](https://badge.waffle.io/dgibbs64/linuxgsm.svg?label=Under%20Development&title=Under%20Development)](http://waffle.io/dgibbs64/linuxgsm)
 
 
-The Linux Game Server Managers are command line tools for quick, simple deployment and management of various dedicated game servers and voice comms servers.
+The Linux Game Server Managers are command line tools for quick, simple deployment and management of various dedicated game servers and voice alert servers.
 
 
 <h2>Hassle-Free Dedicated Servers</h2>
 <h2>Hassle-Free Dedicated Servers</h2>
 Game servers traditionally are not easy to manage yourself. Admins often have to spend hours just messing around trying to get their server working. LGSM is designed to be a simple as possible allowing Admins to spend less time on management and more time on the fun stuff.
 Game servers traditionally are not easy to manage yourself. Admins often have to spend hours just messing around trying to get their server working. LGSM is designed to be a simple as possible allowing Admins to spend less time on management and more time on the fun stuff.
@@ -15,7 +15,8 @@ Game servers traditionally are not easy to manage yourself. Admins often have to
 	<li>Console</li>
 	<li>Console</li>
 	<li>Details</li>
 	<li>Details</li>
 	<li>Installer (SteamCMD)</li>
 	<li>Installer (SteamCMD)</li>
-	<li>Monitor (including email notification)</li>
+	<li>Monitor</li>
+	<li>Alerts (Email, Pushbullet)</li>
 	<li>Update (SteamCMD)</li>
 	<li>Update (SteamCMD)</li>
 	<li>Start/Stop/Restart server</li>
 	<li>Start/Stop/Restart server</li>
 </ul>
 </ul>

+ 9 - 2
RedOrchestra/roserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
Ricochet/ricochetserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
Rust/rustserver

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login (not required)
 # Steam login (not required)
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
SeriousSam3BFE/ss3sserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
StarBound/sbserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
SvenCoop/svencoopserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
TeamFortress2/tf2server

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
TeamFortressClassic/tfcserver

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"
 steampass=""
 steampass=""

+ 9 - 2
TeamSpeak3/ts3server

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Start Variables
 # Start Variables
 updateonstart="off"
 updateonstart="off"
 
 

+ 9 - 2
Teeworlds/twserver

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
Terraria/terrariaserver

@@ -14,11 +14,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Steam login
 # Steam login
 steamuser="username"
 steamuser="username"
 steampass="password"
 steampass="password"

+ 9 - 2
UnrealTournament2004/ut2k4server

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Start Variables
 # Start Variables
 defaultmap="DM-Rankin"
 defaultmap="DM-Rankin"
 ip="0.0.0.0"
 ip="0.0.0.0"

+ 9 - 2
UnrealTournament99/ut99server

@@ -13,11 +13,18 @@ version="150316"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Notification Alerts
 # (on|off)
 # (on|off)
-emailnotification="off"
+
+# Email
+emailalert="off"
 email="email@example.com"
 email="email@example.com"
 
 
+# Pushbullet 
+# https://www.pushbullet.com/#settings
+pushbulletalert"off"
+pushbullettoken="accesstoken"
+
 # Start Variables
 # Start Variables
 defaultmap="DM-Deck16]["
 defaultmap="DM-Deck16]["
 ip="0.0.0.0"
 ip="0.0.0.0"

+ 15 - 0
lgsm/functions/alert.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# LGSM alert.sh function
+# Author: Daniel Gibbs
+# Website: https://gameservermanagers.com
+lgsm_version="140516"
+
+# Description: Overall function for managing alerts.
+
+if [ "${emailalert}" == "on" ]||[ -n "${email}" ]; then
+	alert_email.sh
+fi
+
+if [ "${pushbulletalert}" == "on" ]||[ -n "${pushbullettoken}" ]; then
+	alert_pushbullet.sh
+fi

+ 12 - 12
lgsm/functions/comms_email.sh → lgsm/functions/alert_email.sh

@@ -4,17 +4,17 @@
 # Website: https://gameservermanagers.com
 # Website: https://gameservermanagers.com
 lgsm_version="140516"
 lgsm_version="140516"
 
 
-# Description: Sends email notification if monitor picks up a failure.
+# Description: Sends email alert if monitor picks up a failure.
 
 
-local modulename="Email"
+local modulename="Alert"
 
 
 
 
 fn_details_email(){
 fn_details_email(){
 	#
 	#
-	# Failure reason: Testing bb2-server email notification
+	# Failure reason: Testing bb2-server email alert
 	# Action Taken: Sent test email...hello is this thing on?
 	# Action Taken: Sent test email...hello is this thing on?
 
 
-	echo -e "${commsbody}" >> "${emaillog}"
+	echo -e "${alertbody}" >> "${emaillog}"
 }
 }
 
 
 
 
@@ -168,7 +168,7 @@ fn_details_gameserver(){
 	} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}"
 	} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}"
 }
 }
 
 
-fn_comms_email_template_logs(){
+fn_alert_email_template_logs(){
 	{
 	{
 	echo -e ""
 	echo -e ""
 	echo -e "${servicename} Logs"
 	echo -e "${servicename} Logs"
@@ -214,7 +214,7 @@ fn_comms_email_template_logs(){
 	} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}"
 	} | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}"
 }
 }
 
 
-fn_print_dots "Sending notification to ${email}"
+fn_print_dots "Sending alert to ${email}"
 info_distro.sh
 info_distro.sh
 info_config.sh
 info_config.sh
 info_glibc.sh
 info_glibc.sh
@@ -229,13 +229,13 @@ fn_details_os
 fn_details_performance
 fn_details_performance
 fn_details_disk
 fn_details_disk
 fn_details_gameserver
 fn_details_gameserver
-fn_comms_email_template_logs
-mail -s "${commssubject}" "${email}" < "${emaillog}"
+fn_alert_email_template_logs
+mail -s "${alertsubject}" "${email}" < "${emaillog}"
 exitcode=$?
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then
 if [ "${exitcode}" == "0" ]; then
-	fn_print_ok_nl "Sending notification to ${email}"
-	fn_scriptlog "Success! Sending notification to ${email}"
+	fn_print_ok_nl "Sending alert to ${email}"
+	fn_scriptlog "Success! Sending alert to ${email}"
 else
 else
-	fn_print_fail_nl "Sending notification to ${email}"
-	fn_scriptlog "Failure! Sending notification to ${email}"
+	fn_print_fail_nl "Sending alert to ${email}"
+	fn_scriptlog "Failure! Sending alert to ${email}"
 fi
 fi

+ 14 - 0
lgsm/functions/alert_pushbullet.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# LGSM alert_pushbullet.sh function
+# Author: Daniel Gibbs
+# Website: https://gameservermanagers.com
+lgsm_version="140516"
+
+# Description: alerts using pushbullet.
+
+local modulename="Alert"
+function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+
+curl -u """${pushbullettoken}"":" -d type="note" -d body="${alertbody}" -d title="${alertsubject}" 'https://api.pushbullet.com/v2/pushes' >/dev/null 2>&1
+fn_print_ok_nl "Sent Pushbullet alert"
+fn_scriptlog "Sent Pushbullet alert"

+ 2 - 2
lgsm/functions/check_deps.sh

@@ -38,8 +38,8 @@ fn_deps_detector(){
 }
 }
 
 
 fn_deps_email(){
 fn_deps_email(){
-	# Adds postfix to required dependencies if email notification is enabled
-	if [ "${emailnotification}" == "on" ]; then
+	# Adds postfix to required dependencies if email alert is enabled
+	if [ "${emailalert}" == "on" ]; then
 		if [ -f /usr/bin/mailx ]; then
 		if [ -f /usr/bin/mailx ]; then
 			if [ -d /etc/exim4 ]; then
 			if [ -d /etc/exim4 ]; then
 				array_deps_required+=( exim4 )
 				array_deps_required+=( exim4 )

+ 0 - 22
lgsm/functions/command_comms_check.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# LGSM command_email_test.sh function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-lgsm_version="140516"
-
-# Description: Sends a test email notification.
-
-local modulename="Comms"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
-
-check.sh
-info_config.sh
-if [ "${emailnotification}" = "on" ]||[ "${pushbulletnotification}" = "on" ]; then
-	fn_scriptlog "Sending Comms Check"
-	commssubject="LGSM - Comms Check - ${servername}"
-	commsbody="LGSM testing comms, how you read?"
-	comms.sh
-else
-	fn_print_fail_nl "Notifications not enabled"
-	fn_scriptlog "Notifications not enabled"
-fi

+ 3 - 3
lgsm/functions/command_details.sh

@@ -169,7 +169,7 @@ fn_details_script(){
 	# Service name:        ql-server
 	# Service name:        ql-server
 	# qlserver version:    150316
 	# qlserver version:    150316
 	# User:                lgsm
 	# User:                lgsm
-	# Email notification:  off
+	# Email alert:  off
 	# Update on start:     off
 	# Update on start:     off
 	# Location:            /home/lgsm/qlserver
 	# Location:            /home/lgsm/qlserver
 	# Config file:         /home/lgsm/qlserver/serverfiles/baseq3/ql-server.cfg
 	# Config file:         /home/lgsm/qlserver/serverfiles/baseq3/ql-server.cfg
@@ -205,8 +205,8 @@ fn_details_script(){
 			fi
 			fi
 		fi
 		fi
 
 
-		# Email notification
-		echo -e "\e[34mEmail notification:\t\e[0m${emailnotification}"
+		# Email alert
+		echo -e "\e[34mEmail alert:\t\e[0m${emailalert}"
 
 
 		# Update on start
 		# Update on start
 		echo -e "\e[34mUpdate on start:\t\e[0m${updateonstart}"
 		echo -e "\e[34mUpdate on start:\t\e[0m${updateonstart}"

+ 7 - 7
lgsm/functions/command_monitor.sh

@@ -37,12 +37,12 @@ fn_monitor_msg_checking(){
 	sleep 1	
 	sleep 1	
 }
 }
 
 
-fn_monitor_email_notification(){
+fn_monitor_email_alert(){
 	# Email will be sent if enabled
 	# Email will be sent if enabled
-	if [ "${emailnotification}" = "on" ]; then
-		commssubject="LGSM - Restarted - ${servername}"
-		commsbody="${servicename} process not running"
-		comms.sh
+	if [ "${emailalert}" = "on" ]; then
+		alertsubject="LGSM - Restarted - ${servername}"
+		alertbody="${servicename} process not running"
+		alert.sh
 	fi	
 	fi	
 }
 }
 
 
@@ -57,7 +57,7 @@ fn_monitor_teamspeak3(){
 		fn_print_fail_eol_nl
 		fn_print_fail_eol_nl
 		fn_scriptlog "Checking session: ${ts3error}: FAIL"
 		fn_scriptlog "Checking session: ${ts3error}: FAIL"
 		failurereason="${ts3error}"
 		failurereason="${ts3error}"
-		fn_monitor_email_notification
+		fn_monitor_email_alert
 	fi
 	fi
 	fn_scriptlog "Monitor is starting ${servername}"
 	fn_scriptlog "Monitor is starting ${servername}"
 	sleep 1
 	sleep 1
@@ -83,7 +83,7 @@ fn_monitor_tmux(){
 		fn_print_fail "Checking session: "
 		fn_print_fail "Checking session: "
 		fn_print_fail_eol_nl
 		fn_print_fail_eol_nl
 		fn_scriptlog "Checking session: FAIL"
 		fn_scriptlog "Checking session: FAIL"
-		fn_monitor_email_notification
+		fn_monitor_email_alert
 		fn_scriptlog "Monitor is starting ${servername}"
 		fn_scriptlog "Monitor is starting ${servername}"
 		sleep 1
 		sleep 1
 		command_start.sh
 		command_start.sh

+ 22 - 0
lgsm/functions/command_test_alert.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# LGSM command_email_test.sh function
+# Author: Daniel Gibbs
+# Website: https://gameservermanagers.com
+lgsm_version="140516"
+
+# Description: Sends a test email alert.
+
+local modulename="Alert"
+function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+
+check.sh
+info_config.sh
+if [ "${emailalert}" = "on" ]||[ "${pushbulletalert}" = "on" ]; then
+	fn_scriptlog "Sending alert Check"
+	alertsubject="LGSM - alert Check - ${servername}"
+	alertbody="LGSM testing alert, how you read?"
+	alert.sh
+else
+	fn_print_fail_nl "alerts not enabled"
+	fn_scriptlog "alerts not enabled"
+fi

+ 0 - 15
lgsm/functions/comms.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-# LGSM comms.sh function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-lgsm_version="140516"
-
-# Description: Overall function for managing notifications.
-
-if [ "${emailnotification}" == "on" ]||[ -n "${email}" ]; then
-	comms_email.sh
-fi
-
-if [ "${pushbulletnotification}" == "on" ]||[ -n "${pushbullettoken}" ]; then
-	comms_pushbullet.sh
-fi

+ 0 - 14
lgsm/functions/comms_pushbullet.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-# LGSM comms_pushbullet.sh function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-lgsm_version="140516"
-
-# Description: Notifications using pushbullet.
-
-local modulename="Comms"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
-
-curl -u """${pushbullettoken}"":" -d type="note" -d body="${commsbody}" -d title="${commssubject}" 'https://api.pushbullet.com/v2/pushes' >/dev/null 2>&1
-fn_print_ok_nl "Sent Pushbullet notification"
-fn_scriptlog "Sent Pushbullet notification"

+ 5 - 5
lgsm/functions/core_functions.sh

@@ -111,7 +111,7 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function
 }
 }
 
 
-command_comms_check.sh(){
+command_test_alert.sh(){
 functionfile="${FUNCNAME}"
 functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function
 }
 }
@@ -332,19 +332,19 @@ fn_fetch_function
 }
 }
 
 
 
 
-# Comms
+# Alert
 
 
-comms.sh(){
+alert.sh(){
 functionfile="${FUNCNAME}"
 functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function
 }
 }
 
 
-comms_email.sh(){
+alert_email.sh(){
 functionfile="${FUNCNAME}"
 functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function
 }
 }
 
 
-comms_pushbullet.sh(){
+alert_pushbullet.sh(){
 functionfile="${FUNCNAME}"
 functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function
 }
 }

+ 21 - 21
lgsm/functions/core_getopt.sh

@@ -25,8 +25,8 @@ case "$getopt" in
 		command_validate.sh;;
 		command_validate.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	ct|test-alert)
+		command_test_alert.sh;;
 	dt|details)
 	dt|details)
 		command_details.sh;;
 		command_details.sh;;
 	b|backup)
 	b|backup)
@@ -58,7 +58,7 @@ case "$getopt" in
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mvalidate\t\e[0mv  |Validate server files with SteamCMD."
 		echo -e "\e[34mvalidate\t\e[0mv  |Validate server files with SteamCMD."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
@@ -84,8 +84,8 @@ case "$getopt" in
 		command_update_functions.sh;;
 		command_update_functions.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	et|test-alert)
+		command_test_alert.sh;;
 	dt|details)
 	dt|details)
 		command_details.sh;;
 		command_details.sh;;
 	b|backup)
 	b|backup)
@@ -113,7 +113,7 @@ case "$getopt" in
 		echo -e "\e[34mupdate\t\e[0mu  |Checks and applies updates from SteamCMD."
 		echo -e "\e[34mupdate\t\e[0mu  |Checks and applies updates from SteamCMD."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mchange-password\t\e[0mpw |Changes TS3 serveradmin password."
 		echo -e "\e[34mchange-password\t\e[0mpw |Changes TS3 serveradmin password."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
@@ -136,8 +136,8 @@ case "$getopt" in
 		command_update_functions.sh;;
 		command_update_functions.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	et|test-alert)
+		command_test_alert.sh;;
 	b|backup)
 	b|backup)
 		command_backup.sh;;
 		command_backup.sh;;
 	dev|dev-debug)
 	dev|dev-debug)
@@ -160,7 +160,7 @@ case "$getopt" in
 		echo -e "\e[34mrestart\t\e[0mr  |Restart the server."
 		echo -e "\e[34mrestart\t\e[0mr  |Restart the server."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mdebug\t\e[0md  |See the output of the server directly to your terminal."
 		echo -e "\e[34mdebug\t\e[0md  |See the output of the server directly to your terminal."
@@ -188,8 +188,8 @@ case "$getopt" in
 		command_validate.sh;;
 		command_validate.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	et|test-alert)
+		command_test_alert.sh;;
 	dt|details)
 	dt|details)
 		command_details.sh;;
 		command_details.sh;;
 	b|backup)
 	b|backup)
@@ -223,7 +223,7 @@ case "$getopt" in
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mvalidate\t\e[0mv  |Validate server files with SteamCMD."
 		echo -e "\e[34mvalidate\t\e[0mv  |Validate server files with SteamCMD."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
@@ -248,8 +248,8 @@ case "$getopt" in
 		command_update_functions.sh;;
 		command_update_functions.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	et|test-alert)
+		command_test_alert.sh;;
 	dt|details)
 	dt|details)
 		command_details.sh;;
 		command_details.sh;;
 	b|backup)
 	b|backup)
@@ -280,7 +280,7 @@ case "$getopt" in
 		echo -e "\e[34mrestart\t\e[0mr  |Restart the server."
 		echo -e "\e[34mrestart\t\e[0mr  |Restart the server."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
@@ -313,8 +313,8 @@ case "$getopt" in
 		command_validate.sh;;
 		command_validate.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	et|test-alert)
+		command_test_alert.sh;;
 	dt|details)
 	dt|details)
 		command_details.sh;;
 		command_details.sh;;
 	b|backup)
 	b|backup)
@@ -348,7 +348,7 @@ case "$getopt" in
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mvalidate\t\e[0mv  |Validate server files with SteamCMD."
 		echo -e "\e[34mvalidate\t\e[0mv  |Validate server files with SteamCMD."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
@@ -374,8 +374,8 @@ case "$getopt" in
 		command_update_functions.sh;;
 		command_update_functions.sh;;
 	m|monitor)
 	m|monitor)
 		command_monitor.sh;;
 		command_monitor.sh;;
-	et|comms-check)
-		command_comms_check.sh;;
+	et|test-alert)
+		command_test_alert.sh;;
 	dt|details)
 	dt|details)
 		command_details.sh;;
 		command_details.sh;;
 	b|backup)
 	b|backup)
@@ -408,7 +408,7 @@ case "$getopt" in
 		echo -e "\e[34mrestart\t\e[0mr  |Restart the server."
 		echo -e "\e[34mrestart\t\e[0mr  |Restart the server."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mupdate-functions\t\e[0muf |Removes all functions so latest can be downloaded."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
 		echo -e "\e[34mmonitor\t\e[0mm  |Checks that the server is running."
-		echo -e "\e[34mcomms-check\t\e[0met |Sends test notification."
+		echo -e "\e[34mtest-alert\t\e[0mta |Sends test alert."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mdetails\t\e[0mdt |Displays useful infomation about the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mbackup\t\e[0mb  |Create archive of the server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."
 		echo -e "\e[34mconsole\t\e[0mc  |Console allows you to access the live view of a server."

+ 3 - 3
lgsm/functions/monitor_gsquery.sh

@@ -68,12 +68,12 @@ if [ "${gsquery}" == "yes" ]; then
 				fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : FAIL"
 				fn_scriptlog "Querying port: ${ip}:${port} : ${queryattempt} : FAIL"
 				sleep 1
 				sleep 1
 
 
-				# Send notification if enabled
-				if [ "${emailnotification}" == "on" ]; then
+				# Send alert if enabled
+				if [ "${emailalert}" == "on" ]; then
 					subject="${servicename} Monitor - Starting ${servername}"
 					subject="${servicename} Monitor - Starting ${servername}"
 					failurereason="Failed to query ${servicename}: ${gsquerycmd}"
 					failurereason="Failed to query ${servicename}: ${gsquerycmd}"
 					actiontaken="restarted ${servicename}"
 					actiontaken="restarted ${servicename}"
-					comms.sh
+					alert.sh
 				fi
 				fi
 				fn_restart
 				fn_restart
 				break
 				break

+ 3 - 3
tests/tests_jc2server.sh

@@ -7,10 +7,10 @@ version="271215"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Alert Email
 # (on|off)
 # (on|off)
-emailnotification="on"
-email="me@danielgibbs.co.uk"
+emailalert="off"
+email=""
 
 
 # Steam login
 # Steam login
 steamuser="anonymous"
 steamuser="anonymous"

+ 3 - 3
tests/tests_ts3server.sh

@@ -7,10 +7,10 @@ version="071115"
 
 
 #### Variables ####
 #### Variables ####
 
 
-# Notification Email
+# Alert Email
 # (on|off)
 # (on|off)
-emailnotification="on"
-email="me@danielgibbs.co.uk"
+emailalert="off"
+email=""
 
 
 # Start Variables
 # Start Variables
 updateonstart="off"
 updateonstart="off"