From: martin f. krafft <madduck@seamus.madduck.net>
Date: Tue, 14 Aug 2007 14:03:13 +0000 (+0200)
Subject: switch to using spamc
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/638a5556b1da40dfed06a501546ee46a07974bce?ds=sidebyside

switch to using spamc
---

diff --git a/bin/retrain b/bin/retrain
index a95fbc9..8135509 100755
--- a/bin/retrain
+++ b/bin/retrain
@@ -1,8 +1,10 @@
 #!/bin/sh
 set -eu
 
-NICE='nice -20'
-PROCMAIL="$HOME/.etc/mailfilter/procmail/procmailrc"
+NICE='/usr/bin/nice -20'
+NICE=''
+
+PROCMAIL="$NICE $HOME/.etc/mailfilter/procmail/procmailrc"
 
 PAUSETIME=10
 
diff --git a/bin/train b/bin/train
index 05a768f..4313c44 100755
--- a/bin/train
+++ b/bin/train
@@ -5,17 +5,18 @@ USER=${USER:-$LOGNAME}
 DOMAIN=${DOMAIN:-$(hostname --fqdn)}
 
 NICE='/usr/bin/nice -20'
+NICE=''
 MAILFILTER=$HOME/.etc/mailfilter
 SA_PREFS="$MAILFILTER/spamassassin/user_prefs"
 MAILREAVER="$NICE $HOME/spamfilter/mailreaver.crm -u $MAILFILTER/crm114/"
 SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
-#SPAMC="$NICE /usr/bin/spamc -lxu ${USER}@${DOMAIN}"
-SA_REPORT="$SPAMASSASSIN --report"
-SA_REVOKE="$SPAMASSASSIN --revoke"
+SPAMC="$NICE /usr/bin/spamc -lx"
+SA_REPORT="$SPAMC -C report"
+SA_REVOKE="$SPAMC -C revoke"
 SA_LEARN="$NICE /usr/bin/sa-learn -p $SA_PREFS"
-SA_LEARN_HAM="$SA_LEARN --ham"
-SA_LEARN_SPAM="$SA_LEARN --spam"
-PRE_CLEANUP="$MAILFILTER/procmail/pre-spam-cleanup"
+SA_LEARN_HAM="$SPAMC -L ham"
+SA_LEARN_SPAM="$SPAMC -L spam"
+PRE_CLEANUP="$NICE $MAILFILTER/procmail/pre-spam-cleanup"
 
 HAM=0
 SPAM=0
diff --git a/procmail/defines b/procmail/defines
index 7fc8df6..e7d991a 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -17,7 +17,7 @@ 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"
@@ -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"
-#SPAMC="$NICE /usr/bin/spamc -lxu $ID"
-SPAMC="$SPAMASSASSIN"
+SPAMC="$NICE /usr/bin/spamc -lx"
+#SPAMC="$SPAMASSASSIN"
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`