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
This commit is contained in:
parent
02fe192295
commit
eb0e70bf82
2 changed files with 6 additions and 4 deletions
|
|
@ -116,9 +116,11 @@ EXCLIST=( "/home/*/Trash" \
|
|||
|
||||
# STATIC BACKUP OPTIONS
|
||||
# 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
|
||||
# `--s3-use-new-style` option (for European buckets). Be sure to separate your
|
||||
# options with appropriate spacing.
|
||||
# duplicity. Reference is the manpage of duplicity (available at
|
||||
# http://duplicity.nongnu.org/duplicity.1.html for example)
|
||||
# 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"
|
||||
|
||||
# FULL BACKUP & REMOVE OLDER THAN SETTINGS
|
||||
|
|
|
|||
|
|
@ -153,7 +153,6 @@ export SIGN_PASSPHRASE
|
|||
|
||||
LOGFILE="${LOGDIR}${LOG_FILE}"
|
||||
DUPLICITY="$(which duplicity)"
|
||||
S3CMD="$(which s3cmd)"
|
||||
|
||||
# File to use as a lock. The lock is used to insure that only one instance of
|
||||
# the script is running at a time.
|
||||
|
|
@ -184,6 +183,7 @@ fi
|
|||
|
||||
if [ "`echo ${DEST} | cut -c 1,2`" = "s3" ]; then
|
||||
DEST_IS_S3=true
|
||||
S3CMD="$(which s3cmd)"
|
||||
if [ ! -x "$S3CMD" ]; then
|
||||
echo $NO_S3CMD; S3CMD_AVAIL=false
|
||||
elif [ ! -f "${HOME}/.s3cfg" ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue