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

diff --git a/handlers/dup b/handlers/dup
index 55667f6..3b4d032 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -14,6 +14,8 @@ getconf encryptkey
 
 setsection source
 getconf include
+getconf vsnames all
+getconf vsinclude
 getconf exclude
 
 setsection dest
@@ -29,7 +31,34 @@ destdir=${destdir%/}
 [ "$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 -v lost+found | grep -v 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
@@ -80,6 +109,16 @@ for i in $include; do
 	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