X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=bugs%2Fuser_prefs;h=017f0e0dac561b44a0d985a846d6f04402e660d3;hp=3a1cd5f13c9605598097b0a9a2f52df56cb9996b;hb=HEAD;hpb=986b7af9b78f5a775a054dd7cca075c90ca5c308

diff --git a/bugs/user_prefs b/bugs/user_prefs
index 3a1cd5f..017f0e0 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,16 +35,31 @@ 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
 
+# 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
 
@@ -62,7 +78,7 @@ score BAYES_95 4
 score BAYES_99 4.5
 
 # add a bayes header
-add_header all Bayes score:_BAYES_ _TOKENSUMMARY_ spammytokens:_SMAPPYTOKENS(5)_ hammytokens:_HAMMYTOKENS(5)_
+add_header all Bayes score:_BAYES_ _TOKENSUMMARY_ spammytokens:_SPAMMYTOKENS(5)_ hammytokens:_HAMMYTOKENS(5)_
 
 # blarson 2005-01-28
 clear_trusted_networks
@@ -70,6 +86,43 @@ clear_trusted_networks
 # 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
+
+
+# add our local clamav plugin
+# loadplugin clamav clamav.pm
+if plugin(clamav)
+   full CLAMAV eval:check_clamav()
+   describe CLAMAV contains a virus according to clamav
+   score CLAMAV 8
+endif
+
 # blarson 2004-03-20
 # Disable most DNSBLs -- overhead to high 
 # blarson 2005-01-28 try reducing timeout while adding spamcop back