]> git.madduck.net Git - etc/mailfilter.git/commitdiff

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:

fix tickler
authormartin f. krafft <madduck@madduck.net>
Wed, 20 Feb 2008 12:10:53 +0000 (13:10 +0100)
committermartin f. krafft <madduck@madduck.net>
Wed, 20 Feb 2008 12:10:53 +0000 (13:10 +0100)
procmail/defines
procmail/tickle

index ce23e442fc3a15de80b034898cedc4f2769380ee..a0da9d6201484c7c697675615aada98b2265f54e 100644 (file)
@@ -232,4 +232,4 @@ JUSTME
 
 # DISABLE_DELAYS
 # if set, disables delaying messages
 
 # DISABLE_DELAYS
 # if set, disables delaying messages
-DISABLE_DELAYS=true
+DISABLE_DELAYS
index f03d1abe2a96ed7f8d3da563c2a75be4d5e22999..5c7d19bc6b15f4aae5ce154ce689cd7998c39c98 100644 (file)
@@ -4,8 +4,8 @@
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {
-  DELIVERY_TIME=04:20
-  STAMP
+  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]$
 
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
   * MATCH ?? ^\/[^h]+
   { DELAY="$DATE + $MATCH hours" }
 
   * MATCH ?? ^\/[^h]+
   { DELAY="$DATE + $MATCH hours" }
 
-  JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
-
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+
-  { DELAY="$JUST_DATE + $MATCH months $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+
-  { DELAY="$JUST_DATE + $MATCH weeks $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+
-  { DELAY="$JUST_DATE + $MATCH days $DELIVERY_TIME" }
+  { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }
 
   JUST_DATE
 
   JUST_DATE
-  DELIVERY_TIME
+  DAILY_DELIVERY_TIME
 
   :0 E
   {
 
   :0 E
   {
     HOST
   }
 
     HOST
   }
 
-  DELAYED_QUEUE=$BASE/.store/
-
   :0 fw
   :0 fw
-  |$FORMAIL -i 'X-Tickle: yes'
+  |$FORMAIL -i "X-Tickle: $DELAY"
 
 
-#  :0
-#  * ! STAMP ?? .
-#  { STAMP=`$BIN_DATE +'%s (%c)' -d "$DELAY"` }
-#
-#  :0
-#  * ! STAMP ?? ^[0-9]+ \([A-Za-z ]+ [0-9 :]+\)$
-#  {
-#    LOG="tickle:      error creating timestamp ($STAMP), using \$now$NL"
-#    STAMP="`$BIN_DATE +%s` (ERROR: original stamp '$STAMP' invalid)"
-#  }
-#
-#  :0 E
-#  { LOG="tickle:      stamping message $MSGID with $STAMP$NL" }
-#
-#  :0 fw
-#  |$FORMAIL -i "X-Tickle: $STAMP"
-#
-#  :0
-#  { DEST=$TICKLER_QUEUE }
+  LOG="tickle:      delaying message until $DELAY$NL"
 }
 
 # vim:ft=procmail
 }
 
 # vim:ft=procmail