X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fdup;h=edb43ac4b90ddcf8b732f92ae9e7811692e1f48d;hp=ac7e3295871cc97eb5b2ceb3cf9b95e5ed79553b;hb=be75e4e6c536882c14db9a41c61585e7a9c045f6;hpb=aff6fdf34988b472e0bc016e48dc792ea214918c

diff --git a/handlers/dup b/handlers/dup
index ac7e329..edb43ac 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -35,33 +35,25 @@ destdir=${destdir%/}
 
 ### 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
+# If vservers are configured, check that the ones listed in $vsnames do exist.
+local usevserver=no
+if [ $vservers_are_available = yes ]; then
+   if [ "$vsnames" = all ]; then
+      vsnames="$found_vservers"
+   else
+      if ! vservers_exist "$vsnames" ; then
+            fatal "At least one of the vservers listed in vsnames ($vsnames) does not exist."
+      fi
+   fi
+   if [ -n "$vsinclude" ]; then
+      info "Using vservers '$vsnames'"
+      usevserver=yes
+   fi
 else
    [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
-   [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'   
 fi
 
+
 ### see if we can login ###
 
 if [ "$testconnect" == "yes" ]; then
@@ -78,17 +70,29 @@ fi
 
 ### COMMAND-LINE MANGLING ###
 
+# duplicity >= 0.4.2 needs --sftp-command (NB: sftp does not support the -l option)
+duplicity_version="`duplicity --version | @AWK@ '{print $2}'`"
+duplicity_major="`echo $duplicity_version | @AWK@ -F '.' '{print $1}'`"
+duplicity_minor="`echo $duplicity_version | @AWK@ -F '.' '{print $2}'`"
+duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print $3}'`"
+if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 2 ]; then
+   sftpoptions="$sshoptions"
+fi
+
 scpoptions="$sshoptions"
 [ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit"
 
-execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
+if [ -z "$sftpoptions" ]; then
+   execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
+else
+   execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --sftp-command 'sftp $sftpoptions' --ssh-command 'ssh $sshoptions' "
+fi
 
 # deal with symmetric or asymmetric (public/private key pair) encryption
 if [ -n "$encryptkey" ]; then
     execstr="${execstr}--encrypt-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
 
@@ -98,14 +102,15 @@ if [ "$sign" == yes ]; then
     [ -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
 
+# deal with GnuPG passphrase
+[ -n "$password" ] || fatal "The password option must be set."
+
 if [ "$keep" != "yes" ]; then
     if [ "`echo $keep | tr -d 0-9`" == "" ]; then
 	keep="${keep}D"
@@ -122,35 +127,35 @@ execstr_clientpart="/"
 
 ### SOURCE ###
 
+set -o noglob
+
 # excludes
-for i in "$exclude"; do
-	str="${i//__star__/*}"
-	execstr="${execstr}--exclude '$str' "
+for i in $exclude; do
+   str="${i//__star__/*}"
+   execstr="${execstr}--exclude '$str' "
 done
 	
 # includes 
-for i in "$include"; do
-	str="${i//__star__/*}"
-	execstr="${execstr}--include '$str' "
+for i in $include; do
+   [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
+   str="${i//__star__/*}"
+   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
+if [ $usevserver = yes ]; then
+   for vserver in $vsnames; do
+      for vi in $vsinclude; do
+	 str="${vi//__star__/*}"
+	 str="$VROOTDIR/$vserver$str"
+	 execstr="${execstr}--include '$str' "
+      done
+   done
 fi
 
-### EXECUTE ###
+set +o noglob
 
-# exclude everything else, start with root
-#execstr="${execstr}--exclude '**' / "
-		
-# include client-part and server-part
-#execstr="$execstr $execstr_serverpart"
+### EXECUTE ###
 
 execstr=${execstr//\\*/\\\\\\*}