Backup to S3

diff --git a/backup.sh b/backup.sh
index eb20770ce38b23d5a4eb0c74083fc846686d6c59..ec9a286772397023e0a04a84400f23938a4d3efd 100755 (executable)
--- a/backup.sh
+++ b/backup.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 # uncomment for debug
-#set -x
+set -x
 
 source .duplicity.conf
-source venv2/bin/activate
+export AWS_ACCESS_KEY_ID
+export AWS_SECRET_ACCESS_KEY
+export AWS_DEFAULT_REGION
 
 # duplicity command
-DUPEXEC="duplicity --encrypt-key $ENCRKEY --sign-key $SIGNKEY $DUPOPTS $*"
+DUPEXEC="duplicity --encrypt-key $ENCRKEY --sign-key $SIGNKEY --s3-use-new-style $DUPOPTS $*"
 # loop on directories
 echo -n "---- Incremental backup of $HOSTNAME ---- "; date
 
@@ -14,7 +16,8 @@ for i in $BACKDIRS
 do
   echo Starting backup of directory $i
   # create directory, then backup, then erase old backups
-  $DUPEXEC $i b2://$B2_ACCOUNT_ID:$B2_APPLICATION_KEY@$BUCKET && $DUPEXEC $DUPOPTS_CLEANUP b2://$B2_ACCOUNT_ID:$B2_APPLICATION_KEY@$BUCKET
+  #$DUPEXEC $i b2://$B2_ACCOUNT_ID:$B2_APPLICATION_KEY@$BUCKET && $DUPEXEC $DUPOPTS_CLEANUP b2://$B2_ACCOUNT_ID:$B2_APPLICATION_KEY@$BUCKET
+  $DUPEXEC $i s3://s3-eu-central-1.amazonaws.com/$BUCKET/$FOLDER && $DUPEXEC $DUPOPTS_CLEANUP s3://s3-eu-central-1.amazonaws.com/$BUCKET/$FOLDER
   # verify backup integrity
   #$DUPEXEC --verify b2://$B2_ACCOUNT_ID:$B2_APPLICATION_KEY@$BUCKET $i
 done