From e7ef7ee72b5099fe85026209922a6f50491f9e07 Mon Sep 17 00:00:00 2001 From: micah Date: Sun, 6 Jul 2008 16:05:14 +0000 Subject: [PATCH] . make maildir helper look in every subdirectory of the source directory for maildirs, rather than just looking in the directories [a-zA-Z0-9], thanks for the patch from chris@cenolan.com (Trac#43) git-svn-id: http://code.autistici.org/svn/backupninja/trunk@595 758a04ac-41e6-0310-8a23-8373a73cc35d --- ChangeLog | 5 ++- handlers/maildir.in | 74 ++++++++++++++++++++++++++++----------------- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1a88f4..722f9e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,7 +34,10 @@ version 0.9.6 -- unreleased . New handler from rhatto designed to incrementally pull content from a website to a local folder, based on the rsync handler maildir: - . fixed bug where maildirs that start with a number were skipped. + . fixed bug where maildirs that start with a number were skipped + . make maildir helper look in every subdirectory of the source directory for + maildirs, rather than just looking in the directories [a-zA-Z0-9], thanks + for the patch from chris@cenolan.com (Trac#43). . make deleted maildirs record the date they were deleted . add destid_file configuration option to enable you to specify an alternate ssh public key authentication file (defaulting to /root/.ssh/id_rsa) diff --git a/handlers/maildir.in b/handlers/maildir.in index 87cad4e..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. @@ -53,7 +71,6 @@ 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%/} @@ -76,9 +93,9 @@ 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 @@ -111,15 +128,16 @@ function do_remove() { local tmp1=`maketemp maildir-tmp-file` local tmp2=`maketemp maildir-tmp-file` - ssh -p $destport -i $estid_file $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 -i $destid_file $destuser@$desthost mv "$destdir/$i/$deluser/" "$destdir/deleted" - ssh -p $destport -i $destid_file $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 @@ -129,8 +147,8 @@ 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 -i $destid_file <