Merge branch 'chrissam-dev' into dev

This commit is contained in:
zertrin 2016-03-24 21:12:34 +01:00
commit 5cf7abbdba
2 changed files with 8 additions and 0 deletions

View file

@ -139,6 +139,13 @@ DEST="s3+http://foobar-backup-bucket/backup-folder/"
#AWS_ACCESS_KEY_ID="foobar_aws_key_id"
#AWS_SECRET_ACCESS_KEY="foobar_aws_access_key"
#
# SET STORAGE CLASS for AWS
# The default storage class is STANDARD STORAGE. You can comment this option if
# want to go with standard. The other storage options are --s3-use-ia and --s3-use-rrs.
# Note: --s3-use-ia option is supported only in duplicity version greater than 0.7.06
#
#STORAGECLASS="--s3-use-ia"
#
# S3CMD INFORMATION
# Most people don't need this, but in some cases
# you may want to specify a custom configuration file

View file

@ -568,6 +568,7 @@ duplicity_backup()
{
{
eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
${STORAGECLASS} \
${ENCRYPT} \
${EXCLUDE} \
${INCLUDE} \