no longer except zurich from justme

[etc/mailfilter.git] / bin / train

diff --git a/bin/train b/bin/train
index 05a768f70c4c9e71ec4dc153829804b6dde9c7f5..e9b3426cd8aae28ca938aecc7a5640d842184dd8 100755 (executable)
--- a/bin/train
+++ b/bin/train
@@ -5,17 +5,18 @@ USER=${USER:-$LOGNAME}
 DOMAIN=${DOMAIN:-$(hostname --fqdn)}
 
 NICE='/usr/bin/nice -20'
 DOMAIN=${DOMAIN:-$(hostname --fqdn)}
 
 NICE='/usr/bin/nice -20'

+NICE=''

 MAILFILTER=$HOME/.etc/mailfilter
 SA_PREFS="$MAILFILTER/spamassassin/user_prefs"
 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"
+MAILREAVER="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILTER/crm114/"
+SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
+SPAMC="$NICE /usr/bin/spamc --log-to-stderr"
+SA_REPORT="$SPAMC --reporttype=report"
+SA_REVOKE="$SPAMC --reporttype=revoke"

 SA_LEARN="$NICE /usr/bin/sa-learn -p $SA_PREFS"
 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 --learntype=ham"
+SA_LEARN_SPAM="$SPAMC --learntype=spam"
+PRE_CLEANUP="$NICE $MAILFILTER/procmail/pre-spam-cleanup"

 
 HAM=0
 SPAM=0
 
 HAM=0
 SPAM=0