]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/defines

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:

switch to using spamc
[etc/mailfilter.git] / procmail / defines
index 291bbf2d3b009dab5b1bbe3043bfdaf1ff1a106e..e7d991a7aaa772f037e6a89b6eb728085020147b 100644 (file)
@@ -17,7 +17,7 @@ REPLIES=$MAILFILT/autoreplies
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 
 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"
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
@@ -27,8 +27,8 @@ SED="$NICE /bin/sed"
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
 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`
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`
@@ -58,7 +58,7 @@ CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM=11
 ### constants used in rules
 NL="
 "
 ### 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))?"
 RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
 RE_SPACE_NEWLINE="(^|[         ])"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
@@ -130,11 +130,11 @@ INCLUDERC=$PMDIR/normalise
 
 ### run-time variables
 
 
 ### 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).
 # 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
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason