Merge branch 'paszczus-master' into dev
This commit is contained in:
commit
bbfafcab0c
2 changed files with 46 additions and 16 deletions
|
|
@ -77,6 +77,10 @@
|
|||
#
|
||||
ROOT="/home"
|
||||
|
||||
# Set hostname for this duplicity instance, usefull for e-mail reports
|
||||
#
|
||||
HOSTNAME=$(hostname -f)
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# BACKUP DESTINATION INFORMATION
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
@ -371,6 +375,7 @@ VERBOSITY="-v3"
|
|||
EMAIL_TO=
|
||||
EMAIL_FROM=
|
||||
EMAIL_SUBJECT=
|
||||
EMAIL_FAILURE_ONLY="yes" # send e-mail only if there was an error while creating backup
|
||||
|
||||
# command to use to send mail
|
||||
MAIL="mailx" # default command for Linux mail
|
||||
|
|
|
|||
|
|
@ -540,29 +540,41 @@ duplicity_cleanup()
|
|||
{
|
||||
echo "----------------[ Duplicity Cleanup ]----------------" >> ${LOGFILE}
|
||||
if [[ "${CLEAN_UP_TYPE}" != "none" && ! -z ${CLEAN_UP_TYPE} && ! -z ${CLEAN_UP_VARIABLE} ]]; then
|
||||
eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
|
||||
${ENCRYPT} \
|
||||
${DEST} >> ${LOGFILE}
|
||||
{
|
||||
eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
|
||||
${ENCRYPT} \
|
||||
${DEST} >> ${LOGFILE}
|
||||
} || {
|
||||
BACKUP_ERROR=1
|
||||
}
|
||||
echo >> ${LOGFILE}
|
||||
fi
|
||||
if [ ! -z ${REMOVE_INCREMENTALS_OLDER_THAN} ] && [[ ${REMOVE_INCREMENTALS_OLDER_THAN} =~ ^[0-9]+$ ]]; then
|
||||
eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \
|
||||
${STATIC_OPTIONS} --force \
|
||||
${ENCRYPT} \
|
||||
${DEST} >> ${LOGFILE}
|
||||
{
|
||||
eval ${ECHO} ${DUPLICITY} remove-all-inc-of-but-n-full ${REMOVE_INCREMENTALS_OLDER_THAN} \
|
||||
${STATIC_OPTIONS} --force \
|
||||
${ENCRYPT} \
|
||||
${DEST} >> ${LOGFILE}
|
||||
} || {
|
||||
BACKUP_ERROR=1
|
||||
}
|
||||
echo >> ${LOGFILE}
|
||||
fi
|
||||
}
|
||||
|
||||
duplicity_backup()
|
||||
{
|
||||
eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
|
||||
${ENCRYPT} \
|
||||
${EXCLUDE} \
|
||||
${INCLUDE} \
|
||||
${EXCLUDEROOT} \
|
||||
${ROOT} ${DEST} \
|
||||
>> ${LOGFILE}
|
||||
{
|
||||
eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
|
||||
${ENCRYPT} \
|
||||
${EXCLUDE} \
|
||||
${INCLUDE} \
|
||||
${EXCLUDEROOT} \
|
||||
${ROOT} ${DEST} \
|
||||
>> ${LOGFILE}
|
||||
} || {
|
||||
BACKUP_ERROR=1
|
||||
}
|
||||
}
|
||||
|
||||
setup_passphrase()
|
||||
|
|
@ -680,7 +692,7 @@ backup_this_script()
|
|||
check_variables
|
||||
check_logdir
|
||||
|
||||
echo -e "-------- START DUPLICITY-BACKUP SCRIPT --------\n" >> ${LOGFILE}
|
||||
echo -e "-------- START DUPLICITY-BACKUP SCRIPT for ${HOSTNAME} --------\n" >> ${LOGFILE}
|
||||
|
||||
get_lock
|
||||
|
||||
|
|
@ -832,7 +844,20 @@ esac
|
|||
|
||||
echo -e "--------- END DUPLICITY-BACKUP SCRIPT ---------\n" >> ${LOGFILE}
|
||||
|
||||
email_logfile
|
||||
if [ ${EMAIL_FAILURE_ONLY} == "yes" ]
|
||||
then
|
||||
if [ ${BACKUP_ERROR} ]; then
|
||||
EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
|
||||
email_logfile
|
||||
fi
|
||||
else
|
||||
if [ ${BACKUP_ERROR} ]; then
|
||||
EMAIL_SUBJECT="BACKUP ERROR: ${EMAIL_SUBJECT}"
|
||||
else
|
||||
EMAIL_SUBJECT="BACKUP OK: ${EMAIL_SUBJECT}"
|
||||
fi
|
||||
email_logfile
|
||||
fi
|
||||
|
||||
# remove old logfiles
|
||||
# stops them from piling up infinitely
|
||||
|
|
|
|||
Loading…
Reference in a new issue