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

7DaysToDie/sdtdserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

ARKSurvivalEvolved/arkserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Arma3/arma3server

@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Battlefield1942/bf1942server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

BlackMesa/bmdmserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

BladeSymphony/bsserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

BrainBread2/bb2server

@@ -19,6 +19,7 @@ version="030616"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

CodenameCURE/ccserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

CounterStrike/csserver

@@ -19,6 +19,7 @@ version="060816"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

CounterStrikeConditionZero/csczserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

CounterStrikeGlobalOffensive/csgoserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

CounterStrikeSource/cssserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

DayOfDefeat/dodserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

DayOfDefeatSource/dodsserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

DayOfInfamy/doiserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

DeathmatchClassic/dmcserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

DontStarveTogether/dstserver

@@ -19,6 +19,7 @@ version="130516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

DoubleActionBoogaloo/dabserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

EmpiresMod/emserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

FistfulOfFrags/fofserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

GarrysMod/gmodserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

GoldenEyeSource/gesserver

@@ -19,6 +19,7 @@ version="300816"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

HalfLife2Deathmatch/hl2dmserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

HalfLifeDeathmatch/hldmserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

HalfLifeDeathmatchSource/hldmsserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Hurtworld/hwserver

@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Insurgency/insserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

JustCause2/jc2server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

KillingFloor/kfserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Daniel Gibbs
+Copyright (c) 2016 Daniel Gibbs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Left4Dead/l4dserver

@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Left4Dead2/l4d2server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Minecraft/mcserver

@@ -19,6 +19,7 @@ version="210816"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Mumble/mumbleserver

@@ -20,6 +20,7 @@ version="290716"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

NS2Combat/ns2cserver

@@ -19,6 +19,7 @@ version="220416"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

NaturalSelection2/ns2server

@@ -19,6 +19,7 @@ version="220416"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

NoMoreRoomInHell/nmrihserver

@@ -19,6 +19,7 @@ version="130716"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

OpposingForce/opforserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

PiratesVikingandKnightsII/pvkiiserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

ProjectZomboid/pzserver

@@ -20,6 +20,7 @@ version="290716"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

QuakeLive/qlserver

@@ -19,6 +19,7 @@ version="060516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

RedOrchestra/roserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Ricochet/ricochetserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Rust/rustserver

@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

SeriousSam3BFE/ss3sserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Starbound/sbserver

@@ -19,6 +19,7 @@ version="230716"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

SvenCoop/svencoopserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

TeamFortress2/tf2server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

TeamFortressClassic/tfcserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

TeamSpeak3/ts3server

@@ -19,6 +19,7 @@ version="290716"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Teeworlds/twserver

@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

Terraria/terrariaserver

@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

UnrealTournament/utserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

UnrealTournament2004/ut2k4server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

UnrealTournament3/ut3server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

UnrealTournament99/ut99server

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

WolfensteinEnemyTerritory/wetserver

@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

lgsm/functions/alert_email.sh

@@ -230,7 +230,11 @@ fn_details_performance
 fn_details_disk
 fn_details_gameserver
 fn_alert_email_template_logs
-mail -s "${alertsubject}" "${email}" < "${emaillog}"
+if [ -n "${emailfrom}" ]; then
+	mail -s "${alertsubject}" -a "From: ${emailfrom}" "${email}" < "${emaillog}"
+else
+	mail -s "${alertsubject}" "${email}" < "${emaillog}"
+fi
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then
 	fn_print_ok_nl "Sending alert: ${email}"

tests/tests_jc2server.sh

@@ -19,6 +19,7 @@ fi
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings

tests/tests_ts3server.sh

@@ -19,6 +19,7 @@ fi
 # Email
 emailalert="off"
 email="[email protected]"
+#emailfrom="[email protected]"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings