02fe192295769cf7902e43b2b4171c4747099879
- Author
- zertrin <zrk951@gmail.com>
- Committer
- zertrin <zrk951@gmail.com>
- Date
Message
Merge pull request #22 from philcryer/centos55
added mail option for centos 5.5
Diff
1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
2index 89861be10f4003b59558040017506dbe321e0db6..503729216d570fe4420c47d2b804af8019c5b5ce 100644
3--- a/duplicity-backup.conf.example
4+++ b/duplicity-backup.conf.example
5@@ -160,6 +160,7 @@ EMAIL_SUBJECT=
6
7 # command to use to send mail
8 MAIL="mailx"
9+#MAIL="mail"
10 #MAIL="ssmtp"
11
12 # TROUBLESHOOTING: If you are having any problems running this script it is
13diff --git a/duplicity-backup.sh b/duplicity-backup.sh
14index c3fc583cb372ef21d4642445559814983c01e26d..b48eb424f81298196f5d6478c80b3f502f204832 100755
15--- a/duplicity-backup.sh
16+++ b/duplicity-backup.sh
17@@ -241,7 +241,9 @@ email_logfile()
18 elif [ "$MAIL" = "mailx" ]; then
19 EMAIL_FROM=${EMAIL_FROM:+"-r ${EMAIL_FROM}"}
20 cat ${LOGFILE} | ${MAILCMD} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO}
21- fi
22+ elif [ "$MAIL" = "mail" ]; then
23+ cat ${LOGFILE} | ${MAILCMD} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO} -- -f ${EMAIL_FROM}
24+ fi
25 echo -e "Email alert sent to ${EMAIL_TO} using ${MAIL}" >> ${LOGFILE}
26 fi
27 fi