first implementation of delayed queue

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index e423f06f502482dcddc8ed8df1eb2e84e29c34cc..a54408906e09f6f4b6303a4debc208bf18b7fe2a 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -32,9 +32,11 @@ SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
 SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"
 #SPAMC="$SPAMASSASSIN"
-TRAINER="$MAILFILT/bin/train"
+TRAINER="$NICE $MAILFILT/bin/train"
 
-OURDATE=`date -R`
+SQLITE="$NICE /usr/bin/sqlite3"
+
+OURDATE="`date -R`"
 OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
 
 BASE=$HOME/.maildir
@@ -64,14 +66,18 @@ NL="
 "
 RE_MYDOMAIN="(.+\.)*madduck\.net"
 RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
-RE_SPACE_NEWLINE="(^|[         ])"
+RE_SPACE="[    ]"
+RE_NOT_SPACE="[^       ]"
+RE_SPACE_NEWLINE="(^|$RE_SPACE)"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
-RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
+RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
 
 DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
+DELAYED_QUEUE=$BASE/.delayed/
+TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
@@ -138,6 +144,11 @@ INCLUDERC=$PMDIR/normalise
 # to the X-Been-There header).
 MSG_DEJAVU=!
 
+# DEST
+# set this to a folder if the message should be delivered elsewhere than the
+# default
+DEST
+
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
 SKIP_SPAMCHECKS