X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=bbdb0aeff2dc4bddaa75f538e438603c7807dbc2;hb=c6c3cc98b476fdd575ef52b9e1b63c380828e8f3;hp=55667f6af63dab9f6fc1e353e703d31deea38d25;hpb=cadfdca981b3dd98c2031e2d5c6e8ed5da1ac315;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup b/handlers/dup
index 55667f6..bbdb0ae 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -11,12 +11,16 @@ setsection gpg
 getconf password
 getconf sign no
 getconf encryptkey
+getconf signkey
 
 setsection source
 getconf include
+getconf vsnames all
+getconf vsinclude
 getconf exclude
 
 setsection dest
+getconf incremental yes
 getconf keep 60
 getconf sshoptions
 getconf bandwidthlimit 0
@@ -27,13 +31,39 @@ destdir=${destdir%/}
 
 [ "$destdir" != "" ] || fatal "Destination directory not set"
 [ "$include" != "" ] || fatal "No source includes specified"
-[ "$password" != "" ] || fatal "No password specified"
 
-# see if we can login
+### vservers stuff ###
+
+# See if vservers are configured.
+# If so, check that the ones listed in $vsnames do exist.
+if [ "$vservers" == "yes" ]; then
+    [ -d "$VROOTDIR" ] || fatal "vservers enabled, but $VROOTDIR does not exist!"
+    if [ "$vsnames" == "all" ]; then
+	vsnames=""
+    	for vserver in `ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES"`; do
+	    vsnames="$vserver $vsnames"
+	done
+    else
+	for vserver in "$vsnames"; do
+	    [ -d "$VROOTDIR/$vserver" ] || fatal "vserver '$vserver' does not exist."
+	done
+    fi
+    if [ -n "$vsnames" ]; then
+	if [ -n "$vsinclude" ]; then
+	    info "Using vservers '$vsnames'"
+	    usevserver=1
+	fi
+    else
+	[ -z "$vsinclude" ] || warning 'vsnames is empty, vsinclude configuration lines will be ignored'
+    fi
+fi
+
+### see if we can login ###
+
 if [ "$testconnect" == "yes" ]; then
     debug "ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
     if [ ! $test ]; then
-	result=`ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1' 2>&1`
+	result=`ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'`
 	if [ "$result" != "1" ]; then
 	    fatal "Can't connect to $desthost as $destuser."
 	else
@@ -49,11 +79,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
@@ -63,6 +109,10 @@ if [ "$keep" != "yes" ]; then
     execstr="${execstr}--remove-older-than $keep "
 fi
 
+if [ "$incremental" == "no" ]; then
+    execstr="${execstr}--full "
+fi
+
 execstr_serverpart="scp://$destuser@$desthost/$destdir"
 execstr_clientpart="/"
 
@@ -71,15 +121,25 @@ execstr_clientpart="/"
 # excludes
 for i in $exclude; do
 	str="${i//__star__/*}"
-	execstr="${execstr}--exclude $str "
+	execstr="${execstr}--exclude '$str' "
 done
 	
 # includes 
 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
+	    str="${vi//__star__/*}"
+	    execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
+	done
+    done
+fi
+
 ### EXECUTE ###
 
 # exclude everything else, start with root
@@ -92,17 +152,17 @@ execstr=${execstr//\\*/\\\\\\*}
 
 debug "duplicity $execstr --exclude '**' / $execstr_serverpart"
 if [ ! $test ]; then
+        export PASSPHRASE=$password
 	output=`nice -n $nicelevel \
                   su -c \
-                    "export PASSPHRASE=$password \
-                     && duplicity $execstr --exclude '**' / $execstr_serverpart 2>&1"`
+                    "duplicity $execstr --exclude '**' / $execstr_serverpart 2>&1"`
 	code=$?
-	if [ "$code" == "0" ]; then
+	if [ $code -eq 0 ]; then
 		debug $output
 		info "Duplicity finished successfully."
 	else
-		warning $output
-		warning "Duplicity failed."
+		debug $output
+		fatal "Duplicity failed."
 	fi
 fi