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

diff --git a/handlers/dup b/handlers/dup
index bbdb0ae..7c8a7c6 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
@@ -34,28 +35,22 @@ 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'
 fi
 
 ### see if we can login ###
@@ -84,7 +79,6 @@ 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
 
@@ -94,14 +88,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"
@@ -118,28 +113,35 @@ execstr_clientpart="/"
 
 ### SOURCE ###
 
+set -o noglob
+
 # excludes
 for i in $exclude; do
 	str="${i//__star__/*}"
+	i=`readlink -f ${i#}`
 	execstr="${execstr}--exclude '$str' "
 done
 	
 # includes 
 for i in $include; do
 	str="${i//__star__/*}"
+	i=`readlink -f ${i#}`
 	execstr="${execstr}--include '$str' "
 done
 
 # vsincludes
-if [ $usevserver ]; then
+if [ $usevserver = yes ]; then
     for vserver in $vsnames; do
 	for vi in $vsinclude; do
-	    str="${vi//__star__/*}"
+	    i=`readlink -f $VROOTDIR/$vserver$vi`
+	    str="${i//__star__/*}"
 	    execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
 	done
     done
 fi
 
+set +o noglob
+
 ### EXECUTE ###
 
 # exclude everything else, start with root