c3aa58bf59a7ae5530a0153e44b33a580826aa0e

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

Message

Small improvements to the fix of cippino before merge

Diff

 1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
 2index f90f126a0136a834fb68a40e45028defba7792cb..c81aaf7bed51704a89b8fc5d59d71d5ed39476f2 100644
 3--- a/duplicity-backup.conf.example
 4+++ b/duplicity-backup.conf.example
 5@@ -96,7 +96,7 @@ ROOT="/home"
 6 # 's3.amazonaws.com' to the appropriate host in your .s3cfg file so that the
 7 # remote file size check will work.
 8 #DEST="s3://host/backup-bucket/backup-folder/"
 9-DEST="s3+http://backup-bucket/backup-folder/"
10+DEST="s3+http://foobar-backup-bucket/backup-folder/"
11 # Other possible locations
12 #DEST="ftp://user[:password]@other.host[:port]/some_dir"
13 #DEST="rsync://user@host.com[:port]//absolute_path"
14@@ -116,7 +116,7 @@ DEST="s3+http://backup-bucket/backup-folder/"
15 
16 # INCLUDE LIST OF DIRECTORIES
17 # Here is a list of directories to include; if you want to include
18-# everything that is in root, you could leave this list empty (I think).
19+# everything that is in root, leave this list empty.
20 #
21 # Here is an example with multiple locations:
22 #INCLIST=(  "/home/*/Documents" \
23@@ -126,15 +126,22 @@ DEST="s3+http://backup-bucket/backup-folder/"
24 #        )
25 #
26 # Simpler example with one location:
27-INCLIST=( "/home/foobar_user_name/Documents/Prose/" )
28+INCLIST=( "/home/foobar_user_name/Documents/" )
29 
30 # EXCLUDE LIST OF DIRECTORIES
31 # Even though I am being specific about what I want to include,
32 # there is still a lot of stuff I don't need.
33-EXCLIST=(   "/home/*/Trash" \
34-            "/home/*/Projects/Completed" \
35-            "/**.DS_Store" "/**Icon?" "/**.AppleDouble" \
36-        )
37+# If you don't want to exclude anything, leave this list empty.
38+#
39+# Here is an example with multiple locations:
40+#EXCLIST=(   "/home/*/Trash" \
41+#            "/home/*/Projects/Completed" \
42+#            "/**.DS_Store" \
43+#            "/**Icon?" \
44+#            "/**.AppleDouble" \
45+#        )
46+# Simpler example with one location. Adapt it to your needs.
47+EXCLIST=( "/home/foobar_user_name/Documents/foobar-to-exclude" )
48 
49 # STATIC BACKUP OPTIONS
50 # Here you can define the static backup options that you want to run with
51diff --git a/duplicity-backup.sh b/duplicity-backup.sh
52index 87f1ffbcd0078d4446801076a5ef3e9724aa2a32..143b392ad3fc6b3236d3008fb02bff50db170960 100755
53--- a/duplicity-backup.sh
54+++ b/duplicity-backup.sh
55@@ -225,7 +225,9 @@ config_sanity_fail()
56 check_variables ()
57 {
58   [[ ${ROOT} = "" ]] && config_sanity_fail "ROOT must be configured"
59-  [[ ${DEST} = "" ]] && config_sanity_fail "DEST must be configured"
60+  [[ ${DEST} = "" || ${DEST} = "s3+http://backup-foobar-bucket/backup-folder/" ]] && config_sanity_fail "DEST must be configured"
61+  [[ ${INCLIST} = "/home/foobar_user_name/Documents/" ]] && config_sanity_fail "INCLIST must be configured" 
62+  [[ ${EXCLIST} = "/home/foobar_user_name/Documents/foobar-to-exclude" ]] && config_sanity_fail "EXCLIST must be configured" 
63   [[ ( ${ENCRYPTION} = "yes" && (${GPG_ENC_KEY} = "foobar_gpg_key" || \
64        ${GPG_SIGN_KEY} = "foobar_gpg_key" || \
65        ${PASSPHRASE} = "foobar_gpg_passphrase")) ]] && \