X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=bugs%2Fuser_prefs;h=d5e4d3fe1f995970d4305de9b7c945a0cc944957;hp=8188d4364eb147b18542f0c64dfa2538aabed997;hb=29355145bd6dd70fb86aa23e6f700678e0a4aca8;hpb=652703901508da38854d07b3b53b6d231eff175f

diff --git a/bugs/user_prefs b/bugs/user_prefs
index 8188d43..d5e4d3f 100644
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -8,7 +8,6 @@
 # HEY YOU. YES YOU.
 # RUN spamassassin --lint!
 
-rewrite_subject		0
 report_safe		1
 #defang_mime		0
 required_hits		4
@@ -25,19 +24,13 @@ use_razor2		1
 # testing only --joy, 2003-09-12
 # 2005-01-28 blarson -- doesn't seem to be useful, disabling
 #ok_locales              en
-#ok_languages            en
 #score CHARSET_FARAWAY           0.03
-#score CHARSET_FARAWAY_HEADERS   0.02
 #score HTML_CHARSET_FARAWAY      0.005
 #score MIME_CHARSET_FARAWAY      0.02
-#score UNDESIRED_LANGUAGE_BODY   0.03
 ok_locales              all
-ok_languages            all
 score CHARSET_FARAWAY		0
-score CHARSET_FARAWAY_HEADERS	0
 score HTML_CHARSET_FARAWAY	0
 score MIME_CHARSET_FARAWAY	0
-score UNDESIRED_LANGUAGE_BODY	0
 
 #bayes_expiry_scan_count 20000
 
@@ -55,24 +48,16 @@ bayes_ignore_header X-Spam-Status
 # a bit cautious (cf. #188703)
 # blarson -- ajust again, now that it's trained 2004-05-13
 # blarson 2004-10-22
-# blarson 2006-10-29 2006-11-17
-auto_learn_threshold_nonspam  -5
-score BAYES_00 -3
-score BAYES_01 -2
-score BAYES_10 -1.5
+# blarson 2006-10-29 2006-11-17 2007-11-06
+score BAYES_00 -4
 score BAYES_20 -1
-score BAYES_30 -0.5
 score BAYES_40 -0.2
-score BAYES_44 -0.1
-score BAYES_50 0.5
-score BAYES_56 1
+score BAYES_50 1
 score BAYES_60 2
-score BAYES_70 2.5
 score BAYES_80 3
-score BAYES_90 4
+score BAYES_95 4
 score BAYES_99 4.5
 
-include common/bts_specific
 # blarson 2005-01-28
 clear_trusted_networks
 # the /24 around spohr, master, and gluck
@@ -82,7 +67,15 @@ trusted_networks 127.0.0.1 128.193.0.0/24 146.82.138.0/24 192.25.206.0/24 140.21
 # Disable most DNSBLs -- overhead to high 
 # blarson 2005-01-28 try reducing timeout while adding spamcop back
 # blarson 2005-10-29 adding some back now we are multi-threaded
-rbl_timeout 10
+# blarson 2007-09-14
+rbl_timeout 15
+
+# blarson 2007-09-14
+loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
+# uridnsbl_timeout	5
+rbl_timeout		5
+
+include common/blacklists
 
 include common/common_rbl