X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmaildir;h=a729a3aab17e06f6d561b801a51faa3f9f135156;hb=0d606253af6ecb8ede07b0991a1f295fb70e7e65;hp=c07cd7e3a68d5ef0af603e37d731eda9ccd414bb;hpb=6dc566098abcf32b3bdac4ea820561f7668c7305;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/maildir b/handlers/maildir index c07cd7e..a729a3a 100644 --- a/handlers/maildir +++ b/handlers/maildir @@ -1,12 +1,29 @@ -#!/usr/bin/php4 -q - $loadlimit` +# if [ $over == 1 ]; then +# info "load $load, sleeping..." +# sleep 600 +# else +# break +# fi +# done - cmd="rsync $maildirrsyncflags $excludes '$dir' '$destuser@$desthost:$destdir/maildir/$letter'" - debug $cmd - # ret=`rsync $maildirrsyncflags $excludes '$dir' '$destuser@$desthost:$destdir/maildir/$letter' 2>&1` + cmd="$RSYNC $rsyncflags $excludes $dir $destuser@$desthost:$destdir/$letter" + ret=`rsync -e "ssh -p $destport" -r \ +--links --ignore-existing --delete --size-only --bwlimit=$speedlimit \ +--exclude '.Trash/*' --exclude '.Mistakes/*' --exclude '.Spam/*' \ +$dir $destuser@$desthost:$destdir/$letter \ +2>&1` + ret=$? + # ignore 0 (success) and 24 (file vanished before it could be copied) + if [ $ret != 0 -a $ret != 24 ]; then + warning "rsync $user failed" + warning " returned: $ret" + let "failedcount = failedcount + 1" + if [ $failedcount -gt 100 ]; then + fatal "100 rsync errors -- something is not working right. bailing out." + fi + fi } # remove any maildirs from backup which might have been deleted # and add new ones which have just been created. function do_remove() { - local tmp1=/tmp/maildirtmpfile$$ - local tmp2=/tmp/maildirtmpfile$$ + local tmp1=`maketemp maildir-tmp-file` + local tmp2=`maketemp maildir-tmp-file` for i in 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 $desthost 'ls -1 '$destdir/maildir/$i' | sort > $tmp2 + ssh -p $destport $desthost ls -1 '$destdir/maildir/$i' | sort > $tmp2 for deluser in `join -v 2 $tmp1 $tmp2`; do cmd="ssh -p $destport $desthost rm -vr '$destdir/maildir/$i/$deluser/'" debug $cmd @@ -101,27 +127,183 @@ function do_remove() { rm $tmp2 } +function do_rotate() { + backuproot=$destdir + +( + debug Connecting to $desthost + ssh -T -o PasswordAuthentication=no $desthost -l $destuser < 0; i-- )); do + if [ -d \$dir.\$i ]; then + if [ -f \$dir.\$i/created ]; then + created=\`tail -1 \$dir.\$i/created\` + else + created=0 + fi + cutoff_time=\$(( now - (seconds*(i-1)) )) + if [ ! \$created -gt \$cutoff_time ]; then + next=\$(( i + 1 )) + if [ ! -d \$dir.\$next ]; then + echo "Debug: mv \$dir.\$i \$dir.\$next" + mv \$dir.\$i \$dir.\$next + date +%c%n%s > \$dir.\$next/rotated + else + echo "Info: skipping rotation of \$dir.\$i because \$dir.\$next already exists." + fi + else + echo "Info: skipping rotation of \$dir.\$i because it was created" \$(( (now-created)/86400)) "days ago ("\$(( (now-cutoff_time)/86400))" needed)." + fi + fi + done + done + + max=\$((keepdaily+1)) + if [ \( \$keepweekly -gt 0 -a -d $backuproot/daily.\$max \) -a ! -d $backuproot/weekly.1 ]; then + echo mv $backuproot/daily.\$max $backuproot/weekly.1 + mv $backuproot/daily.\$max $backuproot/weekly.1 + date +%c%n%s > $backuproot/weekly.1/rotated + fi + + max=\$((keepweekly+1)) + if [ \( \$keepmonthly -gt 0 -a -d $backuproot/weekly.\$max \) -a ! -d $backuproot/monthly.1 ]; then + echo mv $backuproot/weekly.\$max $backuproot/monthly.1 + mv $backuproot/weekly.\$max $backuproot/monthly.1 + date +%c%n%s > $backuproot/monthly.1/rotated + fi + + for rottype in daily weekly monthly; do + max=\$((keep\${rottype}+1)) + dir="$backuproot/\$rottype" + oldest=\`find $backuproot -type d -maxdepth 1 -name \$rottype'.*' | sed 's/^.*\.//' | sort -n | tail -1\` + [ "\$oldest" == "" ] && oldest=0 + # if we've rotated the last backup off the stack, remove it. + for (( i=\$oldest; i >= \$max; i-- )); do + if [ -d \$dir.\$i ]; then + if [ -d $backuproot/rotate.tmp ]; then + echo "Info: removing $backuproot/rotate.tmp" + rm -rf $backuproot/rotate.tmp + fi + echo "Info: moving \$dir.\$i to $backuproot/rotate.tmp" + mv \$dir.\$i $backuproot/rotate.tmp + fi + done + done +####### END REMOTE SCRIPT ####### +EOF +) | (while read a; do passthru $a; done) + +} + + +function setup_remote_dirs() { + local backuptype=$1 + local dir="$destdir/$backuptype" + +( + ssh -T -o PasswordAuthentication=no $desthost -l $destuser < $destdir/$btype.1/created" fi