X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=2e4312b0d34ad5d62007a79633b3494ab722e691;hb=2578bfffa4d98005c851ee35e81e55c45fc6e29c;hp=8d38cfc5996f212a5b1840de7e939ac3c31966a3;hpb=bd0b2eaea8db2aecd8ba6f061901d4a41a0881a2;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup b/handlers/dup
index 8d38cfc..2e4312b 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # duplicity script for backupninja
 # requires duplicity
@@ -11,6 +12,7 @@ setsection gpg
 getconf password
 getconf sign no
 getconf encryptkey
+getconf signkey
 
 setsection source
 getconf include
@@ -30,7 +32,6 @@ destdir=${destdir%/}
 
 [ "$destdir" != "" ] || fatal "Destination directory not set"
 [ "$include" != "" ] || fatal "No source includes specified"
-[ "$password" != "" ] || fatal "No password specified"
 
 ### vservers stuff ###
 
@@ -79,11 +80,27 @@ scpoptions="$sshoptions"
 
 execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
 
-if [ "$encryptkey" == "" ]; then
-    [ "$sign" != "yes" ] || fatal "encryptkey option must be set when signing."
-else
+# deal with symmetric or asymmetric (public/private key pair) encryption
+if [ -n "$encryptkey" ]; then
     execstr="${execstr}--encrypt-key $encryptkey "
-    [ "$sign" != "yes" ] || execstr="${execstr}--sign-key $encryptkey "
+    debug "Data will be encrypted with the GnuPG key $encryptkey."
+else
+    [ -n "$password" ] || fatal "The password option must be set when using symmetric encryption."
+    debug "Data will be encrypted using symmetric encryption."
+fi
+
+# deal with data signing
+if [ "$sign" == yes ]; then
+    # duplicity is not able to sign data when using symmetric encryption
+    [ -n "$encryptkey" ] || fatal "The encryptkey option must be set when signing."
+    # if needed, initialize signkey to a value that is not empty (checked above)
+    [ -n "$signkey" ] || signkey="$encryptkey"
+    # check password validity
+    [ -n "$password" ] || fatal "The password option must be set when signing."
+    execstr="${execstr}--sign-key $signkey "
+    debug "Data will be signed will the GnuPG key $signkey."
+else
+    debug "Data won't be signed."
 fi
 
 if [ "$keep" != "yes" ]; then
@@ -103,21 +120,21 @@ execstr_clientpart="/"
 ### SOURCE ###
 
 # excludes
-for i in $exclude; do
+for i in "$exclude"; do
 	str="${i//__star__/*}"
-	execstr="${execstr}--exclude $str "
+	execstr="${execstr}--exclude '$str' "
 done
 	
 # includes 
-for i in $include; do
+for i in "$include"; do
 	str="${i//__star__/*}"
-	execstr="${execstr}--include $str "
+	execstr="${execstr}--include '$str' "
 done
 
 # vsincludes
 if [ $usevserver ]; then
     for vserver in $vsnames; do
-	for vi in $vsinclude; do
+	for vi in "$vsinclude"; do
 	    str="${vi//__star__/*}"
 	    execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
 	done