Merge branch 'patch-2' of https://github.com/sparanoid/duplicity-backup into sparanoid-patch-2

Conflicts:
	duplicity-backup.conf.example
This commit is contained in:
zertrin 2016-03-24 21:03:20 +01:00
commit 60d5e058df

View file

@ -366,15 +366,14 @@ VERBOSITY="-v3"
# EMAIL ALERT (*thanks: rmarescu*) # EMAIL ALERT (*thanks: rmarescu*)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# #
# Provide an email address to receive the logfile by email. If no email # Provide an email address to receive the logfile by email. If EMAIL_TO is not
# address is provided, no alert will be sent. # provided, no alert will be sent.
# You can set a custom from email address and a custom subject (both optionally) # You can set a custom from email address and a custom subject (both optionally)
# If no value is provided for the subject, the following value will be # If no value is provided for the subject, the following value will be
# used by default: "duplicity-backup Alert ${LOG_FILE}" # used by default: "duplicity-backup Alert ${LOG_FILE}"
# MTA used: mailx # MTA used: mailx
#EMAIL_TO="admin@example.com"
#EMAIL="admin@example.com"
EMAIL_TO= EMAIL_TO=
EMAIL_FROM= EMAIL_FROM=
EMAIL_SUBJECT= EMAIL_SUBJECT=