X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=176ac3eae8e5c3066371d07fd4a2086d42b5e9e2;hb=6b6154879b591c79750b329f3ecce9a074de5cb3;hp=2d759b0eee22f01155294256ce36e671ef4c1b29;hpb=26a57c396c75e0e782ffaf3946f6912da0ecf4ae;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup b/handlers/dup
index 2d759b0..176ac3e 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -14,11 +14,14 @@ getconf encryptkey
 
 setsection source
 getconf include
+getconf vsnames all
+getconf vsinclude
 getconf exclude
 
 setsection dest
 getconf keep 60
 getconf sshoptions
+getconf bandwidthlimit 0
 getconf desthost
 getconf destdir
 getconf destuser
@@ -28,11 +31,38 @@ 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 -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
@@ -43,7 +73,10 @@ fi
 
 ### COMMAND-LINE MANGLING ###
 
-execstr="$options --no-print-statistics --scp-command 'scp $sshoptions' --ssh-command 'ssh $sshoptions' "
+scpoptions="$sshoptions"
+[ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit"
+
+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."
@@ -76,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
@@ -88,17 +131,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