New upstream (probably) config changes

[sysconfig/spamassassin.git] / local.cf

diff --git a/local.cf b/local.cf
index 2b7202f5053fd2c8bbc0dea221d3f5e66bbb6266..72605b2582f841ae8da0b7c3fa64b832d20d07fe 100644 (file)
--- a/local.cf
+++ b/local.cf
@@ -7,6 +7,11 @@
 #
 ###########################################################################
 
+#    A 'contact address' users should contact for more info. (replaces
+#    _CONTACTADDRESS_ in the report template)
+# report_contact youremailaddress@domain.tld
+
+
 #   Add *****SPAM***** to the Subject header of spam e-mails
 #
 # rewrite_header Subject *****SPAM*****
@@ -15,7 +20,7 @@
 #   Save spam messages as a message/rfc822 MIME attachment instead of
 #   modifying the original message (0: off, 2: use text/plain instead)
 #
-report_safe 0
+# report_safe 1
 
 
 #   Set which networks or hosts are considered 'trusted' by your mail
@@ -51,3 +56,73 @@ report_safe 0
 # bayes_ignore_header X-Spam-Flag
 # bayes_ignore_header X-Spam-Status
 
+# Increase the Bayes weighting
+ifplugin Mail::SpamAssassin::Plugin::Bayes
+score BAYES_00 0 0 -2.312 -2.599
+score BAYES_05 0 0 -1.110 -1.110
+score BAYES_20 0 0 -0.740 -0.740
+score BAYES_40 0 0 -0.185 -0.185
+score BAYES_50 0 0 0.001 0.001
+score BAYES_60 0 0 1.0 1.0
+score BAYES_80 0 0 2.0 2.0
+score BAYES_95 0 0 4.0 4.0
+score BAYES_99 0 0 5.5 5.5
+endif
+
+whitelist_from  SpamQuarantine@mit.edu
+
+#   Whether to decode non- UTF-8 and non-ASCII textual parts and recode
+#   them to UTF-8 before the text is given over to rules processing.
+#
+# normalize_charset 1
+
+#   Textual body scan limit    (default: 50000)
+#
+#   Amount of data per email text/* mimepart, that will be run through body
+#   rules.  This enables safer and faster scanning of large messages,
+#   perhaps having very large textual attachments.  There should be no need
+#   to change this well tested default.
+#
+# body_part_scan_size 50000
+
+#   Textual rawbody data scan limit    (default: 500000)
+#
+#   Amount of data per email text/* mimepart, that will be run through
+#   rawbody rules.
+#
+# rawbody_part_scan_size 500000
+
+#   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
+#
+#   SpamAssassin tries hard not to launch DNS queries before priority -100.
+#   If you want to shortcircuit without launching unneeded queries, make
+#   sure such rule priority is below -100. These examples are already:
+#
+# shortcircuit USER_IN_WHITELIST       on
+# shortcircuit USER_IN_DEF_WHITELIST   on
+# shortcircuit USER_IN_ALL_SPAM_TO     on
+# shortcircuit SUBJECT_IN_WHITELIST    on
+
+#   the opposite; blacklisted mails can also save CPU
+#
+# shortcircuit USER_IN_BLACKLIST       on
+# shortcircuit USER_IN_BLACKLIST_TO    on
+# shortcircuit SUBJECT_IN_BLACKLIST    on
+
+#   if you have taken the time to correctly specify your "trusted_networks",
+#   this is another good way to save CPU
+#
+# shortcircuit ALL_TRUSTED             on
+
+#   and a well-trained bayes DB can save running rules, too
+#
+# shortcircuit BAYES_99                spam
+# shortcircuit BAYES_00                ham
+
+endif # Mail::SpamAssassin::Plugin::Shortcircuit