fix location of deleted_on file and add missing destid_file options in maildir handler

[matthijs/upstream/backupninja.git] / handlers / maildir.in

diff --git a/handlers/maildir.in b/handlers/maildir.in
index 351415315b8f511ef257c07900e2afd588ee965d..d5731be8ca0ec94b6f623a2062f628155a5c64bc 100644 (file)
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -132,12 +132,12 @@ function do_remove() {
         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
+           ssh -p $destport -i $destid_file $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2
                for deluser in `join -v 2 $tmp1 $tmp2`; do
                        [ "$deluser" != "" ] || continue
                         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'"
+                        ssh -p $destport -i $destid_file $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted"
+                       ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/deleted/$deluser/deleted_on'"
                done
        done
        rm $tmp1