Integrate upstream changes from 3.4.3 -> 3.4.6

[hcoop/config/spamassassin.git] / local.cf

diff --git a/local.cf b/local.cf
index d4a3c0e..3f9f28b 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*****
@@ -36,7 +41,7 @@ report_safe 0
 
 #   Use Bayesian classifier (default: 1)
 #
-# use_bayes 1
+ use_bayes 1
 
 
 #   Bayesian classifier auto-learning (default: 1)
@@ -52,19 +57,70 @@ report_safe 0
 # bayes_ignore_header X-Spam-Status
 
 # Location of bayes data
-bayes_path /var/local/lib/spamd/.spamassassin/bayes
+#bayes_path /var/local/lib/spamd/bayes
 
 # Fix bayes permissions
 bayes_file_mode 0770
 
-# hcoop: auto-whitelist lock
-auto_whitelist_path /var/local/lib/spamd/.spamassassin/auto-whitelist
+# enable txrep
+use_txrep 1
+txrep_autolearn 1
+
+#   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
 
-# Directives from old installation on fyodor
+endif # Mail::SpamAssassin::Plugin::Shortcircuit
 
-# clinton: disabling these for now because they may have helped with
-# an ancient spamd, but probably won't do anything nowadays
-#score PYZOR_CHECK 0
-#score URIBL_SBL 1.096
-#score DNS_FROM_RFC_POST 0.5
-#score FORGED_HOTMAIL_RCVD 0.5
+# hcoop-change: use local caching nameserver for RBL
+dns_server 127.0.0.1
\ No newline at end of file