From a61cb4d7cdc8d526c79800a77373264bac0335d1 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 22 Mar 2016 14:15:40 +0100 Subject: [PATCH] Fixed pfSense mail according to jimp's comment --- dev/debug_obackup.sh | 4 ++-- dev/ofunctions.sh | 4 ++-- obackup.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh index 22356e3..8419b15 100755 --- a/dev/debug_obackup.sh +++ b/dev/debug_obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016031801 IS_STABLE=no -## FUNC_BUILD=2016032201 +## FUNC_BUILD=2016032202 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -273,7 +273,7 @@ function SendAlert { # pfSense specific if [ -f /usr/local/bin/mail.php ]; then - cmd="echo \"$MAIL_ALERT_MSG\" | /usr/local/bin/mail.php subject=\"$subject\"" + cmd="echo \"$MAIL_ALERT_MSG\" | /usr/local/bin/mail.php -s=\"$subject\"" Logger "Mail cmd: $cmd" "DEBUG" eval $cmd if [ $? != 0 ]; then diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index e3d5d9f..d0ed83d 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -1,4 +1,4 @@ -## FUNC_BUILD=2016032201 +## FUNC_BUILD=2016032202 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -263,7 +263,7 @@ function SendAlert { # pfSense specific if [ -f /usr/local/bin/mail.php ]; then - cmd="echo \"$MAIL_ALERT_MSG\" | /usr/local/bin/mail.php subject=\"$subject\"" + cmd="echo \"$MAIL_ALERT_MSG\" | /usr/local/bin/mail.php -s=\"$subject\"" Logger "Mail cmd: $cmd" "DEBUG" eval $cmd if [ $? != 0 ]; then diff --git a/obackup.sh b/obackup.sh index 5b9752e..a307658 100755 --- a/obackup.sh +++ b/obackup.sh @@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre PROGRAM_BUILD=2016031801 IS_STABLE=no -## FUNC_BUILD=2016032201 +## FUNC_BUILD=2016032202 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -262,7 +262,7 @@ function SendAlert { # pfSense specific if [ -f /usr/local/bin/mail.php ]; then - cmd="echo \"$MAIL_ALERT_MSG\" | /usr/local/bin/mail.php subject=\"$subject\"" + cmd="echo \"$MAIL_ALERT_MSG\" | /usr/local/bin/mail.php -s=\"$subject\"" Logger "Mail cmd: $cmd" "DEBUG" eval $cmd if [ $? != 0 ]; then