* add include of bayes configuration

[spamassassin_config.git] / bugs / user_prefs

diff --git a/bugs/user_prefs b/bugs/user_prefs
index 1a68fecd323ae330ec9016fba0c9043cef2378d4..6974b9b70cb44f8e6110518ab718a1d147b71e83 100644 (file)
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -45,6 +45,8 @@ bayes_ignore_header X-Spam-Flag
 bayes_ignore_header X-Spam-Level
 bayes_ignore_header X-Spam-Status
 
+include bayes_configuration
+
 # a bit cautious (cf. #188703)
 # blarson -- ajust again, now that it's trained 2004-05-13
 # blarson 2004-10-22
@@ -61,7 +63,8 @@ score BAYES_99 4.5
 # blarson 2005-01-28
 clear_trusted_networks
 # the /24 around spohr, master, and gluck
-trusted_networks 127.0.0.1 128.193.0.0/24 146.82.138.0/24 192.25.206.0/24 140.211.166.0/24
+# something is already adding 127; remove it.
+trusted_networks 128.193.0.0/24 146.82.138.0/24 192.25.206.0/24 140.211.166.0/24
 
 # blarson 2004-03-20
 # Disable most DNSBLs -- overhead to high 
@@ -72,7 +75,8 @@ rbl_timeout 15
 
 # blarson 2007-09-14
 loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
-uridnsbl_timeout       5
+# uridnsbl_timeout     5
+rbl_timeout            5
 
 include common/blacklists