X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=bugs%2Fuser_prefs;h=6f50e6e850955c5229abfc07621e624c25d1ca11;hp=a22090d8a73a27503b087f438d76433c2514b8a7;hb=8778f3e4813033f5fd3257f13c73ec0fec366804;hpb=e13a06fa8b981989708c3f45b278c5b57089120a

diff --git a/bugs/user_prefs b/bugs/user_prefs
index a22090d..6f50e6e 100644
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -37,7 +37,7 @@ score MIME_CHARSET_FARAWAY	0
 # blarson 2005-01-28 -- try a bigger datebase
 bayes_expiry_max_db_size 300000
 # may solve locking problem at cost of slower updates
-bayes_learn_to_journal	1
+# bayes_learn_to_journal	1
 
 # Cope with refiltered mail
 bayes_ignore_header X-Spam-Checker-Version
@@ -45,30 +45,44 @@ bayes_ignore_header X-Spam-Flag
 bayes_ignore_header X-Spam-Level
 bayes_ignore_header X-Spam-Status
 
+include bayes_configuration
+
 # 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
-score BAYES_00 -3
+# blarson 2006-10-29 2006-11-17 2007-11-06
+score BAYES_00 -4
+score BAYES_05 -2
 score BAYES_20 -1
 score BAYES_40 -0.2
-score BAYES_50 0.5
+score BAYES_50 1
 score BAYES_60 2
 score BAYES_80 3
 score BAYES_95 4
 score BAYES_99 4.5
 
-include common/bts_specific
+# add a bayes header
+add_header all Bayes score:_BAYES_ _TOKENSUMMARY_ spammytokens:_SPAMMYTOKENS(5)_ hammytokens:_HAMMYTOKENS(5)_
+
 # blarson 2005-01-28
 clear_trusted_networks
 # the /24 around spohr, master, and gluck
-trusted_networks 127.0.0.1 128.193.0.0/24 146.82.138.0/24 192.25.206.0/24 140.211.166.0/24
+# something is already adding 127; remove it.
+trusted_networks 128.193.0.0/24 146.82.138.0/24 192.25.206.0/24 140.211.166.0/24
 
 # blarson 2004-03-20
 # 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