X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=lists%2Fuser_prefs;h=2cc3e912918b139ffbc283cb664c88bb31d9a3ed;hp=48a7430f698fa4499710cdc8b6035436d4dbde66;hb=2aefc77dd7ef023afc83708f42ee6018af6378f3;hpb=652703901508da38854d07b3b53b6d231eff175f

diff --git a/lists/user_prefs b/lists/user_prefs
index 48a7430..2cc3e91 100644
--- a/lists/user_prefs
+++ b/lists/user_prefs
@@ -31,7 +31,7 @@ use_pyzor		1
 # testing only --joy, 2003-09-05
 # we have non english lists on lists.d.o --rmurray, 2003-12-03
 # which is why the scores are divided with a hundred, duh --joy, 2004-05-27
-ok_locales              en
+#ok_locales              en
 # ok_languages            en
 
 # good idea, should have been taken further, but preemptively
@@ -44,7 +44,7 @@ ok_locales              en
 # 
 # set more realistic settings, so bayes is not automatic poisoned any more
 #                 -- zobel, 2207-01-13
-bayes_auto_learn_threshold_nonspam  -5
+bayes_auto_learn_threshold_nonspam  -4
 bayes_auto_learn_threshold_spam      27
 
 
@@ -52,17 +52,17 @@ bayes_auto_learn_threshold_spam      27
 # SARE-rules (http://www.rulesemporium.com/rules.htm)
 ################################################################
 
-include /var/list/.spamassassin/sare-rules/70_sare_adult.cf
-include /var/list/.spamassassin/sare-rules/70_sare_header0.cf
-include /var/list/.spamassassin/sare-rules/70_sare_header1.cf
-include /var/list/.spamassassin/sare-rules/70_sare_html0.cf
-include /var/list/.spamassassin/sare-rules/70_sare_html1.cf
-include /var/list/.spamassassin/sare-rules/70_sare_oem.cf
-include /var/list/.spamassassin/sare-rules/70_sare_specific.cf
-include /var/list/.spamassassin/sare-rules/70_sare_stocks.cf
-include /var/list/.spamassassin/sare-rules/72_sare_bml_post25x.cf
-include /var/list/.spamassassin/sare-rules/75_black_uri_list.cf
-include /var/list/.spamassassin/sare-rules/99_sare_fraud_post25x.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_adult.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_header0.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_header1.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_html0.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_html1.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_oem.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_specific.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_stocks.cf
+#include /var/list/.spamassassin/sare-rules/72_sare_bml_post25x.cf
+#include /var/list/.spamassassin/sare-rules/75_black_uri_list.cf
+#include /var/list/.spamassassin/sare-rules/99_sare_fraud_post25x.cf
 
 
 ################################################################
@@ -78,8 +78,38 @@ include /var/list/.spamassassin/newer-rules/60_whitelist_dk.cf
 include /var/list/.spamassassin/newer-rules/70_iadb.cf
 include /var/list/.spamassassin/newer-rules/80_additional.cf
 
+include common/sare/70_sare_adult.cf
+include common/sare/70_sare_header0.cf
+include common/sare/70_sare_header1.cf
+include common/sare/70_sare_header2.cf
+include common/sare/70_sare_header3.cf
+include common/sare/70_sare_header.cf
+include common/sare/70_sare_header_eng.cf
+include common/sare/70_sare_html0.cf
+include common/sare/70_sare_html1.cf
+include common/sare/70_sare_html2.cf
+include common/sare/70_sare_html3.cf
+include common/sare/70_sare_html4.cf
+include common/sare/70_sare_html.cf
+include common/sare/70_sare_oem.cf
+include common/sare/70_sare_specific.cf
+include common/sare/70_sare_spoof.cf
+include common/sare/70_sare_stocks.cf
+include common/sare/72_sare_bml_post25x.cf
+include common/sare/99_sare_fraud_post25x.cf
+
 # Include common spam stuff
 
 include common/common_spam
 include common/list_specific
-include common/score
+include common/scores
+
+header EXINNEN From =~ /schilling\@fokus\.fraunhofer\.de/i
+score EXINNEN 2.3
+
+header LDO_WHITELIST    eval:check_for_subscriber()
+description LDO_WHITELIST Subscribed to the whitelist
+score  LDO_WHITELIST    -5
+
+header XXXPRON	    subject =~ /\bxxx\b/i
+score  XXXPRON	    8.0