[Astlinux-commits] SF.net SVN: astlinux:[7597] branches/1.0

[<abe...@us...>]

Revision: 7597
          http://sourceforge.net/p/astlinux/code/7597
Author:   abelbeck
Date:     2016-03-16 17:17:18 +0000 (Wed, 16 Mar 2016)
Log Message:
-----------
notifications, add a 'name' in the From: header

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-sip-monitor
    branches/1.0/package/asterisk/safe_asterisk
    branches/1.0/package/monit/monit.init
    branches/1.0/package/msmtp/testmail.sh
    branches/1.0/package/nut/upsnotify.sh
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover

Modified: branches/1.0/package/asterisk/asterisk-sip-monitor
===================================================================
--- branches/1.0/package/asterisk/asterisk-sip-monitor	2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/asterisk/asterisk-sip-monitor	2016-03-16 17:17:18 UTC (rev 7597)
@@ -96,7 +96,7 @@
   unset IFS
   for TO in $NOTIFY; do
     echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"SIP-$HOSTNAME\" <$NOTIFY_FROM>}
 Subject: $subject
 
 Warning! Your PBX '$HOSTNAME' has detected that a SIP FAILURE has occurred.
@@ -114,7 +114,7 @@
   unset IFS
   for TO in $NOTIFY; do
     echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"SIP-$HOSTNAME\" <$NOTIFY_FROM>}
 Subject: $subject
 
 SIP Status Change! Your PBX '$HOSTNAME' has an updated list of SIP FAILURE's.
@@ -132,7 +132,7 @@
   unset IFS
   for TO in $NOTIFY; do
     echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"SIP-$HOSTNAME\" <$NOTIFY_FROM>}
 Subject: $subject
 
 Your PBX '$HOSTNAME' has resolved previous SIP issues.

Modified: branches/1.0/package/asterisk/safe_asterisk
===================================================================
--- branches/1.0/package/asterisk/safe_asterisk	2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/asterisk/safe_asterisk	2016-03-16 17:17:18 UTC (rev 7597)
@@ -119,7 +119,7 @@
         logger -s -t safe_asterisk -p kern.info "$MESG"
         for TO in $NOTIFY; do
           echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"Asterisk-$MACHINE\" <$NOTIFY_FROM>}
 Subject: Asterisk **Stopped** on '$MACHINE'
 
 Asterisk on '$MACHINE' stopped, restarting too often.
@@ -145,7 +145,7 @@
       logger -s -t safe_asterisk -p kern.info "$MESG"
       for TO in $NOTIFY; do
         echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"Asterisk-$MACHINE\" <$NOTIFY_FROM>}
 Subject: Asterisk Crashed on '$MACHINE'
 
 Asterisk on '$MACHINE' exited on signal $EXITSIGNAL.  Restarting Asterisk...

Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init	2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/monit/monit.init	2016-03-16 17:17:18 UTC (rev 7597)
@@ -28,6 +28,8 @@
 
   if [ -n "$MONIT_NOTIFY_FROM" ]; then
     echo "set mail-format { from: \"Monit-$HOSTNAME\" <$MONIT_NOTIFY_FROM> }"
+  elif [ -n "$SMTP_DOMAIN" ]; then
+    echo "set mail-format { from: \"Monit-$HOSTNAME\" <monit@$SMTP_DOMAIN> }"
   fi
 
   echo "

Modified: branches/1.0/package/msmtp/testmail.sh
===================================================================
--- branches/1.0/package/msmtp/testmail.sh	2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/msmtp/testmail.sh	2016-03-16 17:17:18 UTC (rev 7597)
@@ -41,7 +41,7 @@
 
 (
   echo "To: ${TO}${FROM:+
-From: $FROM}
+From: \"Test-$HOSTNAME\" <$FROM>}
 Subject: Test Email from '$HOSTNAME'
 
 Test Email from '$HOSTNAME'

Modified: branches/1.0/package/nut/upsnotify.sh
===================================================================
--- branches/1.0/package/nut/upsnotify.sh	2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/package/nut/upsnotify.sh	2016-03-16 17:17:18 UTC (rev 7597)
@@ -23,7 +23,7 @@
 for TO in $NOTIFY; do
   (
   echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"UPS-$HOSTNAME\" <$NOTIFY_FROM>}
 Subject: UPS on '$HOSTNAME': $message
 
 UPS on '$HOSTNAME': $message

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover	2016-03-15 20:52:51 UTC (rev 7596)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover	2016-03-16 17:17:18 UTC (rev 7597)
@@ -75,7 +75,7 @@
   unset IFS
   for TO in $NOTIFY; do
     echo "To: ${TO}${NOTIFY_FROM:+
-From: $NOTIFY_FROM}
+From: \"WAN-$HOSTNAME\" <$NOTIFY_FROM>}
 Subject: $subject
 
 $body

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.