Merge branch 'patch-2' of https://github.com/sparanoid/duplicity-backup into sparanoid-patch-2
Conflicts:
duplicity-backup.conf.example
Diff
1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
2index 46781e102456806d9841abc322e2db6101b08f0e..6edd690a2d1d18d6ca8377cb75c320d48495a6ef 100644
3--- a/duplicity-backup.conf.example
4+++ b/duplicity-backup.conf.example
5@@ -366,15 +366,14 @@ VERBOSITY="-v3"
6 # EMAIL ALERT (*thanks: rmarescu*)
7 # ------------------------------------------------------------------------------
8 #
9-# Provide an email address to receive the logfile by email. If no email
10-# address is provided, no alert will be sent.
11+# Provide an email address to receive the logfile by email. If EMAIL_TO is not
12+# provided, no alert will be sent.
13 # You can set a custom from email address and a custom subject (both optionally)
14 # If no value is provided for the subject, the following value will be
15 # used by default: "duplicity-backup Alert ${LOG_FILE}"
16 # MTA used: mailx
1718-
19-#EMAIL="admin@example.com"
20+#EMAIL_TO="admin@example.com"
21 EMAIL_TO=
22 EMAIL_FROM=
23 EMAIL_SUBJECT=