96a64148fd336851905e494faf2c6f4a40b39d53

Author
zertrin <zrk951@gmail.com>
Committer
GitHub <noreply@github.com>
Date

Message

Merge pull request #173 from xmatthias/dropbox

introduce dropbox functionality

Diff

 1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
 2index bcdbeaafc870cd3d3932872f8037cf380f30dac7..1ededf2f37c0db6e9d1897e951f0f798ea479517 100644
 3--- a/duplicity-backup.conf.example
 4+++ b/duplicity-backup.conf.example
 5@@ -115,6 +115,7 @@ DEST="s3+http://foobar-backup-bucket/backup-folder/"
 6 #DEST="webdav[s]://user[:password]@other.host[:port]/some_dir"
 7 #DEST="gdocs://foobar_google_account/some_dir"
 8 #DEST="swift://foobar_swift_container/some_dir"
 9+#DEST="dpbx:///foobar_swift_container/some_dir"
10 #DEST="b2://some_account_id[:some_application_key]@some_bucket_name/some_dir"
11 
12 
13@@ -174,6 +175,13 @@ DEST="s3+http://foobar-backup-bucket/backup-folder/"
14 #SWIFT_AUTHURL="foobar_swift_authurl"
15 #SWIFT_AUTHVERSION="2"
16 
17+# ------------------------------------------------------------------------------
18+# DROPBOX INFORMATION
19+# ------------------------------------------------------------------------------
20+# Uncomment these lines if you're using Dropbox
21+#
22+#DPBX_ACCESS_TOKEN="foobar_dropbox_access_token"
23+
24 
25 # ------------------------------------------------------------------------------
26 # INCLUDE LIST OF DIRECTORIES
27diff --git a/duplicity-backup.sh b/duplicity-backup.sh
28index 8fa9dfb1797680557a43efefb3991e7d3904dbf4..40f08a39636ace4d0aa417843a9bd4a84d61967e 100755
29--- a/duplicity-backup.sh
30+++ b/duplicity-backup.sh
31@@ -354,6 +354,7 @@ export SWIFT_USERNAME
32 export SWIFT_PASSWORD
33 export SWIFT_AUTHURL
34 export SWIFT_AUTHVERSION
35+export DPBX_ACCESS_TOKEN
36 export PASSPHRASE
37 export SIGN_PASSPHRASE
38 
39@@ -448,6 +449,12 @@ else
40   DEST_IS_S3=false
41 fi
42 
43+if  [ "$(echo "${DEST}" | cut -c 1,4)" = "dpbx" ]; then
44+  DEST_IS_DPBX=true
45+else
46+  DEST_IS_DPBX=false
47+fi
48+
49 if  [ "$(echo "${DEST}" | cut -c 1,2)" = "b2" ]; then
50   DEST_IS_B2=true
51   B2CMD="$(which b2)"
52@@ -481,6 +488,8 @@ check_variables ()
53   config_sanity_fail "An s3 DEST has been specified, but AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY have not been configured"
54   [[ ( ${DEST_IS_GS} = true && (${GS_ACCESS_KEY_ID} = "foobar_gcs_key_id" || ${GS_SECRET_ACCESS_KEY} = "foobar_gcs_secret_id" )) ]] && \
55   config_sanity_fail "A Google Cloud Storage DEST has been specified, but GS_ACCESS_KEY_ID or GS_SECRET_ACCESS_KEY have not been configured"
56+  [[ ( ${DEST_IS_DPBX} = true && (${DPBX_ACCESS_TOKEN} = "foobar_dropbox_access_token" )) ]] && \
57+  config_sanity_fail "A Dropbox DEST has been specified, but DPBX_ACCESS_TOKEN has not been configured"
58   [[ ! -z "${INCEXCFILE}" && ! -f ${INCEXCFILE} ]] && config_sanity_fail "The specified INCEXCFILE ${INCEXCFILE} does not exists"
59 }
60 
61@@ -1151,6 +1160,7 @@ unset AWS_ACCESS_KEY_ID
62 unset AWS_SECRET_ACCESS_KEY
63 unset GS_ACCESS_KEY_ID
64 unset GS_SECRET_ACCESS_KEY
65+unset DPBX_ACCESS_TOKEN
66 unset PASSPHRASE
67 unset SIGN_PASSPHRASE
68 unset FTP_PASSWORD