X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fmaildir.in;h=351415315b8f511ef257c07900e2afd588ee965d;hp=7f2fba7d03b8d0a9ba538db6e9cdc92e1aab9824;hb=98e62c95372a398922c1fc36f7517cb95e9f11c3;hpb=72df77b2103145df5bb3b1d72f23a27ff41f9db6

diff --git a/handlers/maildir.in b/handlers/maildir.in
index 7f2fba7..3514153 100644
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -6,16 +6,34 @@
 #  to a remote server. It is designed to be run with low overhead
 #  in terms of cpu and bandwidth so it runs pretty slow.
 #  Hardlinking is used to save storage space.
+# 
+#  This handler expects that your maildir directory structure is
+#  either one of the following:
+# 
+#  1. /$srcdir/[a-zA-Z0-9]/$user for example: 
+#  /var/maildir/a/anarchist
+#  /var/maildir/a/arthur
+#  ...
+#  /var/maildir/Z/Zaphod
+#  /var/maildir/Z/Zebra
+#  
+#  2. or the following:
+#  /var/maildir/domain.org/user1
+#  /var/maildir/domain.org/user2
+#  ...
+#  /var/maildir/anotherdomain.org/user1
+#  /var/maildir/anotherdomain.org/user2
+#  ...
 #
-#  each users maildir will contain these files:
+#  if the configuration is setup to have keepdaily at 3, 
+#  keepweekly is 2, and keepmonthly is 1, then each user's
+#  maildir backup snapshot directory will contain these files:
 #    daily.1
 #    daily.2
 #    daily.3
 #    weekly.1
 #    weekly.2
 #    monthly.1
-#  if keepdaily is 3, keepweekly is 2, and keepmonthly is 1. 
-#  the actual maildir is stored within each snapshot directory.
 #
 #  The basic algorithm is to rsync each maildir individually,
 #  and to use hard links for retaining historical data.
@@ -49,10 +67,10 @@ getconf destdir
 getconf desthost
 getconf destport 22
 getconf destuser
+getconf destid_file /root/.ssh/id_rsa
 
 getconf multiconnection notset
 
-letters="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z"
 failedcount=0
 # strip trailing /
 destdir=${destdir%/}
@@ -66,7 +84,7 @@ if [ $test ]; then
    testflags="--dry-run -v"
 fi
 
-rsyncflags="$testflags -e 'ssh -p $destport' -r -v --ignore-existing --delete --size-only --bwlimit=$speedlimit"
+rsyncflags="$testflags -e 'ssh -p $destport -i $destid_file' -r -v --ignore-existing --delete --size-only --bwlimit=$speedlimit"
 excludes="--exclude '.Trash/\*' --exclude '.Mistakes/\*' --exclude '.Spam/\*'"
 
 ##################################################################
@@ -75,16 +93,16 @@ excludes="--exclude '.Trash/\*' --exclude '.Mistakes/\*' --exclude '.Spam/\*'"
 function do_user() {
 	local user=$1
 	local btype=$2
-	local letter=${user:0:1}
-	local source="$srcdir/$letter/$user/"
-	local target="$destdir/$letter/$user/$btype.1"
+        local userdir=${3%/}
+        local source="$srcdir/$userdir/$user/"
+        local target="$destdir/$userdir/$user/$btype.1"
 	if [ ! -d $source ]; then
 	  warning "maildir $source not found"
 	  return
     fi
 
 	debug "syncing"
-	ret=`$RSYNC -e "ssh -p $destport" -r \
+	ret=`$RSYNC -e "ssh -p $destport -i $destid_file" -r \
 		--links --ignore-existing --delete --size-only --bwlimit=$speedlimit \
 		--exclude '.Trash/*' --exclude '.Mistakes/*' --exclude '.Spam/*' \
 		$source $destuser@$desthost:$target \
@@ -99,7 +117,7 @@ function do_user() {
 			fatal "100 rsync errors -- something is not working right. bailing out."
 		fi
 	fi
-	ssh -o PasswordAuthentication=no $desthost -l $destuser "date +%c%n%s > $target/created"
+	ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file "date +%c%n%s > $target/created"
 }
 
 # remove any maildirs from backup which might have been deleted
@@ -110,15 +128,16 @@ function do_remove() {
 	local tmp1=`maketemp maildir-tmp-file`
 	local tmp2=`maketemp maildir-tmp-file`
 	
-	ssh -p $destport $destuser@$desthost mkdir -p "$destdir/deleted"
-	for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z; do
-		ls -1 "$srcdir/$i/" | sort > $tmp1
-		ssh -p $destport $destuser@$desthost ls -1 "$destdir/$i/" | sort > $tmp2
+	ssh -p $destport -i $destid_file $destuser@$desthost mkdir -p "$destdir/deleted"
+        cd "$srcdir" 
+        for userdir in `ls -d1 */`; do
+           ls -1 "$srcdir/$userdir" | sort > $tmp1
+           ssh -p $destport $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2
 		for deluser in `join -v 2 $tmp1 $tmp2`; do
 			[ "$deluser" != "" ] || continue
-			info "removing $destuser@$desthost:$destdir/$i/$deluser/"
-			ssh -p $destport $destuser@$desthost mv "$destdir/$i/$deluser/" "$destdir/deleted"
-			ssh -p $destport $destuser@$desthost "date +%c%n%s > '$destdir/$i/$deluser/deleted_on'"
+                        info "removing $destuser@$desthost:$destdir/$userdir$deluser/"
+                        ssh -p $destport $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted"
+			ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/$userdir$deluser/deleted_on'"
 		done
 	done
 	rm $tmp1
@@ -128,10 +147,10 @@ function do_remove() {
 function do_rotate() {
 	[ "$rotate" == "yes" ] || return;
 	local user=$1
-	local letter=${user:0:1}
-	local backuproot="$destdir/$letter/$user"
+        local userdir=${2%/}
+        local backuproot="$destdir/$userdir/$user"
 (
-	ssh -T -o PasswordAuthentication=no $desthost -l $destuser <<EOF
+	ssh -T -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file <<EOF
 ##### BEGIN REMOTE SCRIPT #####
 	seconds_daily=86400
 	seconds_weekly=604800
@@ -226,11 +245,11 @@ EOF
 function setup_remote_dirs() {
 	local user=$1
 	local backuptype=$2
-	local letter=${user:0:1}
-	local dir="$destdir/$letter/$user/$backuptype"
-	local tmpdir="$destdir/$letter/$user/rotate.tmp"
+        local userdir=${3%/}
+        local dir="$destdir/$userdir/$user/$backuptype"
+        local tmpdir="$destdir/$userdir/$user/rotate.tmp"
 (
-	ssh -T -o PasswordAuthentication=no $desthost -l $destuser <<EOF
+	ssh -T -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file <<EOF
 		if [ ! -d $destdir ]; then
 			echo "Fatal: Destination directory $destdir does not exist on host $desthost."
 			exit 1
@@ -275,7 +294,7 @@ EOF
 function start_mux() {
 	if [ "$multiconnection" == "yes" ]; then
 		debug "Starting dummy ssh connection"
-		ssh -p $destport $destuser@$desthost sleep 1d &
+		ssh -p $destport -i $destid_file $destuser@$desthost sleep 1d &
         sleep 1
 	fi
 }
@@ -283,7 +302,7 @@ function start_mux() {
 function end_mux() {
 	if [ "$multiconnection" == "yes" ]; then
 		debug "Stopping dummy ssh connection"
-		ssh -p $destport $destuser@$desthost pkill sleep
+		ssh -p $destport -i $destid_file $destuser@$desthost pkill sleep
 	fi
 }
 
@@ -291,11 +310,11 @@ function end_mux() {
 ##################################################################
 
 # see if we can login
-debug "ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
+debug "ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file 'echo -n 1'"
 if [ ! $test ]; then
-	result=`ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1' 2>&1`
+	result=`ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file 'echo -n 1' 2>&1`
 	if [ "$result" != "1" ]; then
-		fatal "Can't connect to $desthost as $destuser."
+		fatal "Can't connect to $desthost as $destuser using $destid_file."
 	fi
 fi
 
@@ -303,7 +322,7 @@ end_mux
 start_mux
 
 ## SANITY CHECKS ##
-status=`ssh -p $destport $destuser@$desthost "[ -d \"$destdir\" ] && echo 'ok'"`
+status=`ssh -p $destport -i $destid_file $destuser@$desthost "[ -d \"$destdir\" ] && echo 'ok'"`
 if [ "$status" != "ok" ]; then
 	end_mux
 	fatal "Destination directory $destdir doesn't exist!"
@@ -330,16 +349,18 @@ if [ "$backup" == "yes" ]; then
 		setup_remote_dirs $testuser $btype
 		do_user $testuser $btype
 	else
-		for i in $letters; do
-			[ -d "$srcdir/$i" ] || fatal "directory $srcdir/$i not found."
-			cd "$srcdir/$i"
-			debug $i
+                [ -d "$srcdir" ] || fatal "directory $srcdir not found."
+                cd "$srcdir"
+                for userdir in `ls -d1 */`; do
+                   [ -d "$srcdir/$userdir" ] || fatal "directory $srcdir/$userdir not found."
+                   cd "$srcdir/$userdir"
+                   debug $userdir
 			for user in `ls -1`; do
 				[ "$user" != "" ] || continue
-				debug $user
-				do_rotate $user
-				setup_remote_dirs $user $btype
-				do_user $user $btype
+                                debug "$user $userdir"
+                                do_rotate $user $userdir
+                                setup_remote_dirs $user $btype $userdir
+                                do_user $user $btype $userdir
 			done
 		done
 	fi