postpone delaying and fix resubmission

[etc/mailfilter.git] / procmail / delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index e04f7d7a7fceb01d750a4c23bbcb711194c1e2e5..405cbcba33f504a327233bcc6ec79d7a194593be 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,12 +1,9 @@
-:0
-* ^X-Mailer: swaks
-{ DELAY="30 seconds" }
-
 # create table messages (msgid text unique not null, filename text
 # primary key not null unique, release_ts integer not null);
 
 :0
 * DELAY ?? .
+* ! DELAYED ?? .
 {
   #TODO: for tickling, use header date
   RELEASE="`date -d \"now + $DELAY\" +'%s %c'`"
@@ -29,6 +26,9 @@
      ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
   TRAP="$TRAP; $DO_QUERY '$Q'"
 
+  :0 fw
+  |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+
   :0
   $DELAYED_QUEUE
 }