allow certain senders to pass undelayed, and add penny

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index bc4572d8cba121bfaf21445203147b723d98d6d0..0a40a1bcabedf03393fa818cb2507101dd512171 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,18 +1,18 @@
+# The X-Tickle header has priority over the Original-To address
 :0
-* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
-* ORIGINAL_TO ?? ^\/[^@]+
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
 { TICKLE="$MATCH" }
 
 :0 E
-*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+* ! POSTPONED ?? .
+* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
+* ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }
 
 :0
 * TICKLE ?? .
 * ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
 {
-  LOG="tickle:      '$TICKLE'$NL"
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
 
@@ -50,10 +50,16 @@
   JUST_DATE
   DAILY_DELIVERY_TIME
 
-  LOG="tickle:      delaying message until $DELAY$NL"
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
   DELAYED_QUEUE=$TICKLER_QUEUE
 
-  # unset DISABLE_DELAYS to enable delaying for tickle messages
+  :0 fw
+  |$FORMAIL -I"X-Tickle: $RELEASE"
+
+  # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }