X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff;h=713f4c6e53732fed9fd85de78c6644d5b6cf44dd;hb=d52a1ac97e97c51c15ccd52d7dce93d3a092e636;hp=1f2058f47c4adf6d862a03b9e12140d13868dc33;hpb=ef78e14b29df0a9f010c3c2a07572bef5668d079;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/rdiff b/handlers/rdiff
index 1f2058f..713f4c6 100644
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -3,12 +3,16 @@
 # requires rdiff-backup
 #
 
+getconf options
+getconf testconnect yes
+getconf nicelevel 0
+
 setsection source
 getconf type; sourcetype=$type
 getconf label
-getconf user; sourceuser=$user
-getconf keep
+getconf keep 60
 getconf include
+getconf vsinclude
 getconf exclude
 
 ### DESTINATION ###
@@ -21,64 +25,81 @@ getconf type; desttype=$type
 getconf user; destuser=$user
 getconf host; desthost=$host
 
-[ "$destdir" != "" ] || fatal "Destination directory not set"
-[ "$desttype" == "remote" ] || fatal "Only remote destinations are supported"
-
-# see if we can login
-debug 0 "su $sourceuser -c \"ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'\""
-if [ ! $test ]; then
-	result=`su $sourceuser -c "ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'" 2>&1`
-	if [ "$result" != "1" ]; then
-		fatal "Can't connect to $desthost as $destuser."
+# See if vservers are configured
+if [ "$vservers" = "yes" ]
+then
+	if [ ! -d $VROOTDIR ]
+	then
+		fatal "vservers enabled, but $VROOTDIR does not exist!"
+	else
+		info "vserver method enabled"
+		usevserver=1
 	fi
 fi
 
-# see that rdiff-backup has the same version as here
-debug 0 "su $sourceuser -c \"ssh $desthost -l $destuser '$RDIFFBACKUP -V'\""
-if [ ! $test ]; then
-	remoteversion=`su $sourceuser -c "ssh $desthost -l $destuser '$RDIFFBACKUP -V'" 2>&1`
+[ "$destdir" != "" ] || fatal "Destination directory not set"
+
+if [ "$desttype" == "remote" ]; then
+	# see if we can login
+	if [ "$testconnect" == "yes" ]; then
+		hostalive=0
+	    debug "ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
+		ret=`ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n host is alive'`
+		if echo $ret | grep "host is alive"; then
+			debug "Connected to $desthost as $destuser successfully"
+		else
+			fatal "Can't connect to $desthost as $destuser."
+		fi
+	fi
+	# see that rdiff-backup has the same version as here
+	debug "ssh $desthost -l $destuser '$RDIFFBACKUP -V'\""
+	remoteversion=`ssh $desthost -l $destuser "$RDIFFBACKUP -V | grep rdiff-backup"`
 	localversion=`$RDIFFBACKUP -V`
 	if [ "$remoteversion" != "$localversion" ]; then
 		fatal "rdiff-backup does not have the same version on this computer and the backup server."
 	fi
+	execstr_serverpart="$destuser@$desthost::$destdir/$label"
+else
+	execstr_serverpart="$destdir/$label"
 fi
 
-execstr_serverpart="$destuser@$desthost::$destdir/$label"
-		
 ### SOURCE ###
 
 [ "$label" != "" ] || fatal "Source missing label"
 [ "$sourcetype" == "local" ] || fatal "Only local source type supported"
-[ "$include" != "" ] || fatal "No source includes specified"
+[ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified"
+#TODO should I test for vsinclude if usevservers=1?
 
 execstr_clientpart="/"
 	
 ## REMOVE OLD BACKUPS
 
-if [ "$keep" -gt "0" ]; then
-	removestr="rdiff-backup --force --remove-older-than ${keep}D "
-	if [ "$desttype" == "remote" ]; then
-		removestr="${removestr}${destuser}@${desthost}::"
-	fi
-	removestr="${removestr}${destdir}/${label}";
-	
-	debug 0 "su $sourceuser -c '$removestr'"
-	if [ ! $test ]; then
-		output=`su $sourceuser -c "$removestr" 2>&1`
-		code=$?
-		if [ "$code" == "0" ]; then
-			debug 0 $output
-			debug 1 "Removing backups older than $keep days succeeded."
-		else
-			debug 2 $output
-			debug 2 "Failed removing backups older than $keep."
-		fi
+if [ "`echo $keep | tr -d 0-9`" == "" ]; then
+	keep="${keep}D"
+fi
+
+removestr="rdiff-backup --force --remove-older-than $keep "
+if [ "$desttype" == "remote" ]; then
+	removestr="${removestr}${destuser}@${desthost}::"
+fi
+removestr="${removestr}${destdir}/${label}";
+
+debug "$removestr"
+if [ ! $test ]; then
+	output=`$removestr 2>&1`
+	code=$?
+	if [ "$code" == "0" ]; then
+		debug $output
+		info "Removing backups older than $keep days succeeded."
+	else
+		warning $output
+		warning "Failed removing backups older than $keep."
 	fi
 fi
 
 ## EXECUTE ##
-	
-execstr="$RDIFFBACKUP --print-statistics "
+
+execstr="$RDIFFBACKUP $options --print-statistics "
 
 # TODO: order the includes and excludes
 
@@ -94,22 +115,35 @@ for i in $include; do
 	execstr="${execstr}--include '$str' "
 done
 
+# vsinclude
+if [ $usevserver ] 
+then
+	for vserver in `ls $VROOTDIR|grep -v lost+found`
+	do
+		for vi in $vsinclude
+		do
+			str="${vi//__star__/*}"
+			execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
+		done
+	done
+fi
+
 # exclude everything else
 execstr="${execstr}--exclude '/*' "
 		
 # include client-part and server-part
 execstr="${execstr}$execstr_clientpart $execstr_serverpart"
 
-debug 0 "su $sourceuser -c '$execstr'"
+debug "$execstr"
 if [ ! $test ]; then
-	output=`su $sourceuser -c "$execstr" 2>&1`
+	output=`nice -n $nicelevel su -c "$execstr" 2>&1`
 	code=$?
 	if [ "$code" == "0" ]; then
-		debug 0 $output
-		debug 1 "Successfully finished backing up source '$label'"
+		debug $output
+		info "Successfully finished backing up source '$label'"
 	else
-		debug 2 $output
-		debug 2 "Failed backup up source '$label'"
+		warning $output
+		warning "Failed backup up source '$label'"
 	fi
 fi