Add SpamAssassin-related tweaks.

1 files changed, 78 insertions, 34 deletions

diff --git a/spamassassin/local.cf b/spamassassin/local.cf
index 1d65b9e..b6b9af0 100644
--- a/spamassassin/local.cf
+++ b/spamassassin/local.cf
@@ -1,44 +1,88 @@
-# Add your own customisations to this file.  See 'man Mail::SpamAssassin::Conf'
-# for details of what can be tweaked.
-# 
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# Only a small subset of options are listed below
+#
+###########################################################################
+
+#   Add *****SPAM***** to the Subject header of spam e-mails
+#
+# rewrite_header Subject *****SPAM*****
+
+
+#   Save spam messages as a message/rfc822 MIME attachment instead of
+#   modifying the original message (0: off, 2: use text/plain instead)
+#
+# report_safe 1
+
+
+#   Set which networks or hosts are considered 'trusted' by your mail
+#   server (i.e. not spammers)
+#
+# trusted_networks 212.17.35.
+
+
+#   Set file-locking method (flock is not safe over NFS, but is faster)
+#
+# lock_method flock
 
-# Revert CHARSET_FARAWAY scores to upsream default
-score CHARSET_FARAWAY                0.80
-score CHARSET_FARAWAY_BODY           2.06
-score CHARSET_FARAWAY_HEADERS        1.00
 
-# Lower Razor score (from 3.0) to let more mailinglist mail through
-score RAZOR_CHECK		     2.0
+#   Set the threshold at which a message is considered spam (default: 5.0)
+#
+required_score 3.0
 
-# The below was found at http://flakshack.com/anti-spam/wiki/index.php?page=Debian
 
-report_safe 0
+#   Use Bayesian classifier (default: 1)
+#
+# use_bayes 1
+
+
+#   Bayesian classifier auto-learning (default: 1)
+#
+# bayes_auto_learn 1
+
+
+#   Set headers which may provide inappropriate cues to the Bayesian
+#   classifier
+#
+# bayes_ignore_header X-Bogosity
+# bayes_ignore_header X-Spam-Flag
+# bayes_ignore_header X-Spam-Status
+
+
+#   Some shortcircuiting, if the plugin is enabled
+# 
+ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
+#
+#   default: strongly-whitelisted mails are *really* whitelisted now, if the
+#   shortcircuiting plugin is active, causing early exit to save CPU load.
+#   Uncomment to turn this on
+#
+# shortcircuit USER_IN_WHITELIST       on
+# shortcircuit USER_IN_DEF_WHITELIST   on
+# shortcircuit USER_IN_ALL_SPAM_TO     on
+# shortcircuit SUBJECT_IN_WHITELIST    on
 
-use_bayes 1
-bayes_path /var/lib/amavis/.spamassassin/bayes_seen
+#   the opposite; blacklisted mails can also save CPU
+#
+# shortcircuit USER_IN_BLACKLIST       on
+# shortcircuit USER_IN_BLACKLIST_TO    on
+# shortcircuit SUBJECT_IN_BLACKLIST    on
 
-skip_rbl_checks 0
-use_razor2 1
-use_dcc 1
-use_pyzor 1
+#   if you have taken the time to correctly specify your "trusted_networks",
+#   this is another good way to save CPU
+#
+# shortcircuit ALL_TRUSTED             on
 
-dns_available yes
+#   and a well-trained bayes DB can save running rules, too
+#
+# shortcircuit BAYES_99                spam
+# shortcircuit BAYES_00                ham
 
-header LOCAL_RCVD Received =~ /.*\(\S+\.mydomain\.bogus\s+\[.*\]\)/
-describe LOCAL_RCVD Received from local machine
-score LOCAL_RCVD -50
+endif # Mail::SpamAssassin::Plugin::Shortcircuit
 
-## Optional Score Increases
-score DCC_CHECK 4.000
-score SPF_FAIL 10.000
-score SPF_HELO_FAIL 10.000
-score RAZOR2_CHECK 2.500
-score BAYES_99 4.300
-score BAYES_90 3.500
-score BAYES_80 3.000
+use_bayes 0
 
-# Added by jsu2
-# refer to http://flakshack.com/anti-spam/wiki/index.php?page=Testing
-body LOCAL_TEST1 /myspamtest12341234/
-describe LOCAL_TEST1 This is a unique phrase to trigger a positive score
-score LOCAL_TEST1 50
+dns_query_restriction deny barracudacentral.org