5cf7abbdba6ab38344f4e7e1041e65a1d448497b

Author
zertrin <zertrin@gmail.com>
Committer
zertrin <zertrin@gmail.com>
Date

Message

Merge branch 'chrissam-dev' into dev

Diff

 1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
 2index 6edd690a2d1d18d6ca8377cb75c320d48495a6ef..bad10926266873875b46a7f2dde8a1e54d59980e 100644
 3--- a/duplicity-backup.conf.example
 4+++ b/duplicity-backup.conf.example
 5@@ -139,6 +139,13 @@ DEST="s3+http://foobar-backup-bucket/backup-folder/"
 6 #AWS_ACCESS_KEY_ID="foobar_aws_key_id"
 7 #AWS_SECRET_ACCESS_KEY="foobar_aws_access_key"
 8 #
 9+# SET STORAGE CLASS for AWS
10+# The default storage class is STANDARD STORAGE. You can comment this option if 
11+# want to go with standard. The other storage options are --s3-use-ia and --s3-use-rrs.
12+# Note: --s3-use-ia option is supported only in duplicity version greater than 0.7.06 
13+#
14+#STORAGECLASS="--s3-use-ia"
15+#
16 # S3CMD INFORMATION
17 # Most people don't need this, but in some cases
18 # you may want to specify a custom configuration file
19diff --git a/duplicity-backup.sh b/duplicity-backup.sh
20index 642eea31f5b57e82b6ac5a8f787a2a99c5b80dfb..ba8df930bdadd82ee6e3da7995e83a63c8bbf571 100755
21--- a/duplicity-backup.sh
22+++ b/duplicity-backup.sh
23@@ -568,6 +568,7 @@ duplicity_backup()
24 {
25   {
26     eval ${ECHO} ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
27+    ${STORAGECLASS} \
28     ${ENCRYPT} \
29     ${EXCLUDE} \
30     ${INCLUDE} \