Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #12 from markruys/master

[1] Email incompatible with SELinux [2] Cleanup broken with european buckets  (untested by thornomad, looks good though)
  • Loading branch information...
commit ae9e2aab88b7505c3167ccd65d2fb65884174350 2 parents fc7b46f + 881f08d
Damon Timm thornomad authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 dt-s3-backup.sh
4 dt-s3-backup.sh
View
@@ -219,7 +219,7 @@ include_exclude()
duplicity_cleanup()
{
echo "-----------[ Duplicity Cleanup ]-----------" >> ${LOGFILE}
- ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} --force \
+ ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
--encrypt-key=${GPG_KEY} \
--sign-key=${GPG_KEY} \
${DEST} >> ${LOGFILE}
@@ -441,7 +441,7 @@ if [ $EMAIL_TO ]; then
else
EMAIL_FROM=${EMAIL_FROM:+"-r ${EMAIL_FROM}"}
EMAIL_SUBJECT=${EMAIL_SUBJECT:="DT-S3 Alert ${LOG_FILE}"}
- ${MAIL} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO} < ${LOGFILE}
+ cat ${LOGFILE} | ${MAIL} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO}
echo -e "Email alert sent to ${EMAIL_TO} using ${MAIL}" >> ${LOGFILE}
fi
fi
Please sign in to comment.
Something went wrong with that request. Please try again.