]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/tickle

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

leave X-Tickle header for tickle messages
[etc/mailfilter.git] / procmail / tickle
index 5c7d19bc6b15f4aae5ce154ce689cd7998c39c98..0a40a1bcabedf03393fa818cb2507101dd512171 100644 (file)
@@ -1,50 +1,68 @@
+# The X-Tickle header has priority over the Original-To address
 :0
-* ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ TICKLE="$MATCH" }
+
+:0 E
+* ! POSTPONED ?? .
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
+{ TICKLE="$MATCH" }
+
+:0
+* TICKLE ?? .
+* ! DEST ?? .
 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
 
   :0
-  * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
-  { DELAY="@$MATCH" }
+  * TICKLE ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
+  { DELAY="@$TICKLE" }
 
   :0 E
-  * MATCH ?? ^[0-9]+h$
-  * MATCH ?? ^\/[^h]+
+  * TICKLE ?? ^[0-9]+h$
+  * TICKLE ?? ^\/[^h]+
   { DELAY="$DATE + $MATCH hours" }
 
   :0 E
-  * MATCH ?? ^[0-9]+m$
-  * MATCH ?? ^\/[^m]+
+  * TICKLE ?? ^[0-9]+m$
+  * TICKLE ?? ^\/[^m]+
   { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }
 
   :0 E
-  * MATCH ?? ^[0-9]+w$
-  * MATCH ?? ^\/[^w]+
+  * TICKLE ?? ^[0-9]+w$
+  * TICKLE ?? ^\/[^w]+
   { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }
 
   :0 E
-  * MATCH ?? ^[0-9]+d?$
-  * MATCH ?? ^\/[^d]+
+  * TICKLE ?? ^[0-9]+d?$
+  * TICKLE ?? ^\/[^d]+
   { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }
 
-  JUST_DATE
-  DAILY_DELIVERY_TIME
-
   :0 E
   {
-    LOG="tickle:      invalid date string: $MATCH$NL"
+    LOG="tickle:      invalid tickler date string: $TICKLE$NL"
     EXITCODE=69
     HOST
   }
 
+  JUST_DATE
+  DAILY_DELIVERY_TIME
+
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
+  DELAYED_QUEUE=$TICKLER_QUEUE
+
   :0 fw
-  |$FORMAIL -i "X-Tickle: $DELAY"
+  |$FORMAIL -I"X-Tickle: $RELEASE"
 
-  LOG="tickle:      delaying message until $DELAY$NL"
+  # unset DISABLE_DELAYS to always enable delaying for tickle messages
+  DISABLE_DELAYS
 }
 
+TICKLE
+
 # vim:ft=procmail