minor changes to the pull request before merging

This commit is contained in:
zertrin 2016-03-24 20:59:42 +01:00
parent ff1e8270c0
commit 471cc9f88b
2 changed files with 4 additions and 6 deletions

View file

@ -387,14 +387,12 @@ MAIL="mailx" # default command for Linux mail
#MAIL="sendmail"
#MAIL="msmtp"
# You may also specify a custom mail script. It will be called via
# You may specify a custom mail script instead. It will be called with
# the following convention:
# MAIL "SUBJECT OF MESSAGE" "TO EMAIL ADDRESS" "FROM EMAIL ADDRESS"
# The email body will be available on stdin.
#MAIL="/path/to/custom/mail_script.py
#
#MAIL="/path/to/custom/mail_script.py"
# ------------------------------------------------------------------------------

View file

@ -364,7 +364,7 @@ email_logfile()
(echo """Subject: ${EMAIL_SUBJECT}""" ; cat ${LOGFILE}) | ${MAILCMD} -f ${EMAIL_FROM} ${EMAIL_TO}
elif [ "$MAIL" = "nail" ]; then
cat ${LOGFILE} | ${MAILCMD} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO}
else
else
cat ${LOGFILE} | ${MAILCMD} """${EMAIL_SUBJECT}""" ${EMAIL_FROM} ${EMAIL_TO}
fi
echo -e "Email alert sent to ${EMAIL_TO} using ${MAIL}" >> ${LOGFILE}