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

diff --git a/ChangeLog b/ChangeLog
index ca0a95212f98a94b9013cb5258b3c534b67a0d33..2ca863d7869bc3648929d9ea014dca6267a8e432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 version 0.9.7 -- UNRELEASED
     backupninja changes
         . fix bug in reportspace, thanks Dan Garthwaite
 version 0.9.7 -- UNRELEASED
     backupninja changes
         . fix bug in reportspace, thanks Dan Garthwaite

+    handler changes
+       maildir:
+        . fix location of deleted_on file
+        . add missing destid_file options to ssh connections

 
 version 0.9.6 -- July 21, 2008
     backupninja changes
 
 version 0.9.6 -- July 21, 2008
     backupninja changes


@@ -216,7 +220,7 @@ version 0.9.4 -- October 6th, 2006
            sshoptions (Closes: #388543)
         . Now forbid to (try to) include /.
        sys:
            sshoptions (Closes: #388543)
         . Now forbid to (try to) include /.
        sys:

-        . Many more system checks were added, (thanks to Petr Klíma)
+        . Many more system checks were added, (thanks to Petr Klíma)

         . Added warning if no devices were found (thanks Ranier Zocholl)
         . Enhanced debian package selections to include purged packages (thanks
           Tom Hoover)
         . Added warning if no devices were found (thanks Ranier Zocholl)
         . Enhanced debian package selections to include purged packages (thanks
           Tom Hoover)


@@ -337,7 +341,7 @@ version 0.9.2 -- December 29, 2005
 
 version 0.9.1 -- November 05 2005
     rearranged source so that it is relocatable with autotools
 
 version 0.9.1 -- November 05 2005
     rearranged source so that it is relocatable with autotools

-        (thanks to Petr Klíma petr.klima@madeta-group.cz)
+        (thanks to Petr Klíma petr.klima@madeta-group.cz)

     fixed many bugs in rdiff helper
     rdiff handler does not require 'label' (for real this time?)
     added makecd ninjahelper
     fixed many bugs in rdiff helper
     rdiff handler does not require 'label' (for real this time?)
     added makecd ninjahelper

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
         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/"
                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
                done
        done
        rm $tmp1