fix devlivery of messages, now last match wins

[etc/mailfilter.git] / procmail / defines
diff --git a/procmail/defines b/procmail/defines

index f87ac5e74323c70985a345e413c9c6cfc3c426c1..c38adab1906742c1d1e15c50a213cd8241afc7f5 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
@@ -74,6 +76,8 @@ RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
  DEJAVU_HEADER=X-Deja-Vu
  
  NULL=/dev/null
+DELAY_QUEUE=$BASE/.delay/
+TICKLER_QUEUE=$BASE/.tickler/
  DISCARD=$BASE/.discard/
  #DISCARD="'|$DELIVER -m BASE.discard'"