2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close issues #18 and #20 : which s3cmd only called when dest is s3 and hint in the comments of the config file to use --s3-european-buckets option for european buckets

Browse source
This commit is contained in:
Zertrin 2012-10-20 13:11:18 +02:00
parent 02fe192295
commit eb0e70bf82
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
duplicity-backup.conf.example
View file

@ -116,9 +116,11 @@ EXCLIST=( "/home/*/Trash" \
# STATIC BACKUP OPTIONS # STATIC BACKUP OPTIONS
# Here you can define the static backup options that you want to run with # Here you can define the static backup options that you want to run with
# duplicity. I use both the `--full-if-older-than` option plus the # duplicity. Reference is the manpage of duplicity (available at
# `--s3-use-new-style` option (for European buckets). Be sure to separate your # http://duplicity.nongnu.org/duplicity.1.html for example)
# options with appropriate spacing. # Useful examples are `--full-if-older-than` option and (for those using
# Amazon S3 in Europe) `--s3-use-new-style` and `--s3-european-buckets` options
# Be sure to separate your options with appropriate spacing.
STATIC_OPTIONS="--full-if-older-than 14D --s3-use-new-style" STATIC_OPTIONS="--full-if-older-than 14D --s3-use-new-style"
# FULL BACKUP & REMOVE OLDER THAN SETTINGS # FULL BACKUP & REMOVE OLDER THAN SETTINGS

2
duplicity-backup.sh
View file

@ -153,7 +153,6 @@ export SIGN_PASSPHRASE
LOGFILE="${LOGDIR}${LOG_FILE}" LOGFILE="${LOGDIR}${LOG_FILE}"
DUPLICITY="$(which duplicity)" DUPLICITY="$(which duplicity)"
S3CMD="$(which s3cmd)"
# File to use as a lock. The lock is used to insure that only one instance of # File to use as a lock. The lock is used to insure that only one instance of
# the script is running at a time. # the script is running at a time.
@ -184,6 +183,7 @@ fi
if [ "`echo ${DEST} | cut -c 1,2`" = "s3" ]; then if [ "`echo ${DEST} | cut -c 1,2`" = "s3" ]; then
DEST_IS_S3=true DEST_IS_S3=true
S3CMD="$(which s3cmd)"
if [ ! -x "$S3CMD" ]; then if [ ! -x "$S3CMD" ]; then
echo $NO_S3CMD; S3CMD_AVAIL=false echo $NO_S3CMD; S3CMD_AVAIL=false
elif [ ! -f "${HOME}/.s3cfg" ]; then elif [ ! -f "${HOME}/.s3cfg" ]; then