X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=bugs%2Fuser_prefs;h=17bba9aed7617cf688a405d448f91185403c39ec;hp=d5e4d3fe1f995970d4305de9b7c945a0cc944957;hb=89d117808a01a891c1ef5087a9bb2839187a9a39;hpb=4d550114ca4960619051749bd14efcd7161af226

diff --git a/bugs/user_prefs b/bugs/user_prefs
index d5e4d3f..17bba9a 100644
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -34,10 +34,14 @@ score MIME_CHARSET_FARAWAY	0
 
 #bayes_expiry_scan_count 20000
 
+loadplugin Mail::SpamAssassin::Plugin::Bayes
 # blarson 2005-01-28 -- try a bigger datebase
-bayes_expiry_max_db_size 300000
+bayes_expiry_max_db_size 3000000
 # may solve locking problem at cost of slower updates
-bayes_learn_to_journal	1
+# bayes_learn_to_journal	1
+
+# make sure bayes is on
+use_bayes 1
 
 # Cope with refiltered mail
 bayes_ignore_header X-Spam-Checker-Version
@@ -45,11 +49,14 @@ 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 2007-11-06
 score BAYES_00 -4
+score BAYES_05 -2
 score BAYES_20 -1
 score BAYES_40 -0.2
 score BAYES_50 1
@@ -58,10 +65,44 @@ score BAYES_80 3
 score BAYES_95 4
 score BAYES_99 4.5
 
+# 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
+
+# local hack to deal with missing plugin issues
+
+loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
+loadplugin Mail::SpamAssassin::Plugin::Hashcash
+loadplugin Mail::SpamAssassin::Plugin::SPF
+loadplugin Mail::SpamAssassin::Plugin::Pyzor
+loadplugin Mail::SpamAssassin::Plugin::Razor2
+loadplugin Mail::SpamAssassin::Plugin::SpamCop
+loadplugin Mail::SpamAssassin::Plugin::AWL
+loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold
+loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
+loadplugin Mail::SpamAssassin::Plugin::ReplaceTags
+loadplugin Mail::SpamAssassin::Plugin::Check
+loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch
+loadplugin Mail::SpamAssassin::Plugin::URIDetail
+loadplugin Mail::SpamAssassin::Plugin::BodyEval
+loadplugin Mail::SpamAssassin::Plugin::DNSEval
+loadplugin Mail::SpamAssassin::Plugin::HTMLEval
+loadplugin Mail::SpamAssassin::Plugin::HeaderEval
+loadplugin Mail::SpamAssassin::Plugin::MIMEEval
+loadplugin Mail::SpamAssassin::Plugin::RelayEval
+loadplugin Mail::SpamAssassin::Plugin::URIEval
+loadplugin Mail::SpamAssassin::Plugin::WLBLEval
+loadplugin Mail::SpamAssassin::Plugin::VBounce
+loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+loadplugin Mail::SpamAssassin::Plugin::ImageInfo
+
+
 
 # blarson 2004-03-20
 # Disable most DNSBLs -- overhead to high