X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/ad1d64c3df127f0da629bf66b36696294c11a8cb..4ba2f39737ab0344a5b1d0ab05dd1743a3f98dd0:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 291bbf2..c825b51 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -17,25 +17,27 @@ 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
 
+#DEFAULT="|$DELIVER"
 DEFAULT=$INBOX/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
@@ -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))?"
@@ -67,6 +69,7 @@ RE_EXTRACT_HEADER_VALUE="[ 	]*\/[^ 	].*"
 
 NULL=/dev/null
 DISCARD=$INBOX/.discard/
+#DISCARD="'|$DELIVER -m INBOX.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