X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lists%2Fuser_prefs;h=8484b44c8d82572594e1e4540ba47a7147b0fc72;hb=0146ac555718a8c2ef9931d87371fbf85a6ca9de;hp=5ae0640e69a5bd9f66a50ecb203e064c4073854f;hpb=1d2e21926a683f56e5d58b4f588baf00386e61fc;p=spamassassin_config.git

diff --git a/lists/user_prefs b/lists/user_prefs
index 5ae0640..8484b44 100644
--- a/lists/user_prefs
+++ b/lists/user_prefs
@@ -1,3 +1,4 @@
+# -*- mode: spamassassin -*-
 # SpamAssassin user preferences file.  See 'man Mail::SpamAssassin::Conf' for
 # details of what can be tweaked.
 ###########################################################################
@@ -16,8 +17,8 @@ dns_available test: gluck.debian.org master.debian.org klecker.debian.org
 # use newer score and rules, but don't override our own scores
 include /var/list/.spamassassin/newer-rules/50_scores.cf
 
-internal_networks	70.103.162.31/32 127.0.0.1/32
-trusted_networks	70.103.162.0/24 127.0.0.1/32 192.25.206.10/32
+internal_networks	82.195.75.100/32
+trusted_networks	82.195.75.64/26 70.103.162.0/24 192.25.206.10/32
 
 # No unnecessary crap --liiwi 2004-08-29
 report_safe 		0
@@ -71,12 +72,13 @@ subscriber_file /var/list/uniq-subscribers
 # newer rules which aren't in /usr/share/spamassassin
 ################################################################
 
-include /var/list/.spamassassin/newer-rules/20_dnsbl_tests.cf
-include /var/list/.spamassassin/newer-rules/20_head_tests.cf
-include /var/list/.spamassassin/newer-rules/20_ratware.cf
-include /var/list/.spamassassin/newer-rules/20_uri_tests.cf
-include /var/list/.spamassassin/newer-rules/25_uribl.cf
-include /var/list/.spamassassin/newer-rules/60_whitelist_dk.cf
+# these rules are already newer in newer SA
+# include /var/list/.spamassassin/newer-rules/20_dnsbl_tests.cf
+# include /var/list/.spamassassin/newer-rules/20_head_tests.cf
+# include /var/list/.spamassassin/newer-rules/20_ratware.cf
+# include /var/list/.spamassassin/newer-rules/20_uri_tests.cf
+# include /var/list/.spamassassin/newer-rules/25_uribl.cf
+# include /var/list/.spamassassin/newer-rules/60_whitelist_dk.cf
 include /var/list/.spamassassin/newer-rules/70_iadb.cf
 include /var/list/.spamassassin/newer-rules/80_additional.cf
 
@@ -105,6 +107,17 @@ include common/sare/99_sare_fraud_post25x.cf
 include common/common_spam
 include common/list_specific
 include common/scores
+include common/debian_specific
+include common/drug_spam
+include common/image_spam
+include common/misc_spam
+include common/money_spam
+include common/phrase_spam
+include common/pron_spam
+include common/scam_spam
+include common/url_spam
+include common/virus_spam
+
 
 header EXINNEN From =~ /schilling\@fokus\.fraunhofer\.de/i
 score EXINNEN 2.3