X-Git-Url: https://git.hcoop.net/hcoop/config/spamassassin.git/blobdiff_plain/f315eace63756e8594c5346dfd7f53f40cd3dca7..80e9c9710f1e84e41283253c4ce4b7b490e44f33:/local.cf

diff --git a/local.cf b/local.cf
index baf1567..120ab86 100644
--- a/local.cf
+++ b/local.cf
@@ -52,19 +52,48 @@ 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
 
-# Directives from old installation on fyodor
+#   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
+
+#   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
+
+#   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
 
-# 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