dd05ff68b6bc593edd2b13ee950d510f883ddd0e

Author
zertrin <zertrin@gmail.com>
Committer
zertrin <zertrin@gmail.com>
Date

Message

Add support for mail sending via msmtp

(adapted cherry-pick from commit 7f8b9b6e2fb49ce3bae166674a06754e5940ea04 of Dosenpfand)

Diff

 1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
 2index c81aaf7bed51704a89b8fc5d59d71d5ed39476f2..168e28cfbb5fb6bb3f5cec5a45fe11cb36cbd0fe 100644
 3--- a/duplicity-backup.conf.example
 4+++ b/duplicity-backup.conf.example
 5@@ -209,6 +209,7 @@ MAIL="mailx"     # default command for Linux mail
 6 #MAIL="mail"     # for CentOS, if "mailx" fails try this one
 7 #MAIL="ssmtp"
 8 #MAIL="sendmail"
 9+#MAIL="msmtp"
10 
11 # TROUBLESHOOTING: If you are having any problems running this script it is
12 # helpful to see the command output that is being generated to determine if the
13diff --git a/duplicity-backup.sh b/duplicity-backup.sh
14index 02288663ccac6d77ba29d0b28acf948942d432f0..6dec36fbe9fb56430cd57cd95ad80215b4701ee6 100755
15--- a/duplicity-backup.sh
16+++ b/duplicity-backup.sh
17@@ -271,6 +271,8 @@ email_logfile()
18           EMAIL_SUBJECT=${EMAIL_SUBJECT:="duplicity-backup alert ${LOG_FILE}"}
19           if [ "$MAIL" = "ssmtp" ]; then
20             echo """Subject: ${EMAIL_SUBJECT}""" | cat - ${LOGFILE} | ${MAILCMD} -s ${EMAIL_TO}
21+          elif [ "$MAIL" = "msmtp" ]; then
22+            echo """Subject: ${EMAIL_SUBJECT}""" | cat - ${LOGFILE} | ${MAILCMD} ${EMAIL_TO}
23           elif [ "$MAIL" = "mailx" ]; then
24             EMAIL_FROM=${EMAIL_FROM:+"-r ${EMAIL_FROM}"}
25             cat ${LOGFILE} | ${MAILCMD} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO}