X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/5af333ca3b83425e5cb3aa704b37654d576856c1..90b680896df34b1a64d4541ceea5491a58136558:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 4fec548..cd1240e 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -17,26 +17,28 @@ REPLIES=$MAILFILT/autoreplies
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 
-NICE='/usr/bin/nice -20'
+#NICE='/usr/bin/nice -20'
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
 EGREP="$NICE /bin/egrep"
 SED="$NICE /bin/sed"
+DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
-#SPAMC="$NICE /usr/bin/spamc -lxu $ID"
-SPAMC="$SPAMASSASSIN"
+SPAMC="$NICE /usr/bin/spamc -lx"
+#SPAMC="$SPAMASSASSIN"
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%m.%N`
+OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
 
-INBOX=$HOME/.maildir
+BASE=$HOME/.maildir
 
-DEFAULT=$INBOX/
+#DEFAULT="|$DELIVER"
+DEFAULT=$BASE/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
@@ -58,7 +60,7 @@ CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM=11
 ### constants used in rules
 NL="
 "
-RE_MYDOMAIN="(.+\.)?madduck\.net"
+RE_MYDOMAIN="(.+\.)*madduck\.net"
 RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
 RE_SPACE_NEWLINE="(^|[ 	])"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
@@ -66,7 +68,8 @@ RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[ 	]*\/[^ 	].*"
 
 NULL=/dev/null
-DISCARD=$INBOX/.discard/
+DISCARD=$BASE/.discard/
+#DISCARD="'|$DELIVER -m BASE.discard'"
 
 ### variables from the message
 
@@ -130,11 +133,11 @@ INCLUDERC=$PMDIR/normalise
 
 ### run-time variables
 
-# OLD_MESSAGE
+# REPROC_MESSAGE
 # a procmail-style flag, which is true if unset and false if set (to !).
 # unset by marknew if the message has already been seen by the filter (according
 # to the X-Been-There header).
-OLD_MESSAGE=!
+REPROC_MESSAGE=!
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
@@ -165,6 +168,6 @@ SPAM_UNSURE
 # skipping.
 SPAM_UNKNOWN
 
-# CRM_RETRAIN
-# if set, causes crm114 to be retrained, according to the variable's value
-CRM_RETRAIN
+# RETRAIN
+# if set, causes spamfilters to be retrained, according to the variable's value
+RETRAIN