X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=bugs%2Fuser_prefs;h=09167bab4e1e308da984a9e90cac2f1ec90c4dfc;hp=0ffcaa36a5eadab70648038eaa5ac32627035104;hb=2c50b4a0861f83e732214ec8bdab1cd40a9c8c85;hpb=106259e860f4a8959c1d5014b913e411288c9120

diff --git a/bugs/user_prefs b/bugs/user_prefs
index 0ffcaa3..09167ba 100644
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -1,3 +1,4 @@
+# -*- mode: spamassassin -*-
 # This is the right place to customize your installation of SpamAssassin.
 # See 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked.
 #
@@ -34,22 +35,40 @@ 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
 bayes_ignore_header X-Spam-Flag
 bayes_ignore_header X-Spam-Level
 bayes_ignore_header X-Spam-Status
+# blarson 2009-04-09
+# if we can't use Ironport as spam sign, at least don't treat it as non-spam
+bayes_ignore_header X-IronPort-Anti-Spam-Filtered
+bayes_ignore_header X-IronPort-Anti-Spam-Result
+bayes_ignore_header X-IronPort-AV
+# blarson 2009-05-22 google spam
+bayes_ignore_header DKIM-Signature
+bayes_ignore_header DomainKey-Signature
+# blarson 2010-02-23
+bayes_ignore_header X-Greylist
+
+
+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,12 +77,45 @@ 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
 # 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 
 # blarson 2005-01-28 try reducing timeout while adding spamcop back