New upstream config?

diff --git a/init.pre b/init.pre
index 97b2203584a5c52855143e54ff126a3683fc3929..a330badc36ac2108dfcb844325733b8233c5c8f8 100644 (file)
--- a/init.pre
+++ b/init.pre
@@ -17,7 +17,7 @@
 # RelayCountry - add metadata for Bayes learning, marking the countries
 # a message was relayed through
 #
-# Note: This requires the IP::Country::Fast Perl module
+# Note: This requires the Geo::IP Perl module
 #
 # loadplugin Mail::SpamAssassin::Plugin::RelayCountry
 

diff --git a/local.cf b/local.cf
index 65b0b13831f9377d545a614c06ad659e2961ad4f..cfe12b2d912e7fea8ca2881f34f93c0a28cc244e 100644 (file)
--- a/local.cf
+++ b/local.cf
@@ -60,8 +60,40 @@ 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 3.5 3.5
-score BAYES_99 0 0 5.0 5.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
+
+#   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
+