ditch old rules from .spamassassin

[spamassassin_config.git] / lists / user_prefs

diff --git a/lists/user_prefs b/lists/user_prefs
index 032e02be3bbceb57a7f9d82632935dc361bcf8e5..8484b44c8d82572594e1e4540ba47a7147b0fc72 100644 (file)
--- 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
@@ -47,6 +48,8 @@ use_pyzor             1
 bayes_auto_learn_threshold_nonspam  -4
 bayes_auto_learn_threshold_spam      27
 
+subscriber_file /var/list/uniq-subscribers
+
 
 ################################################################
 # SARE-rules (http://www.rulesemporium.com/rules.htm)
@@ -69,12 +72,13 @@ bayes_auto_learn_threshold_spam      27
 # 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
 
@@ -103,6 +107,40 @@ 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 3.4
+score EXINNEN 2.3
+
+header LDO_WHITELIST   eval:check_for_subscriber('/var/list/uniq-subscribers')
+describe LDO_WHITELIST Subscribed to the whitelist
+score  LDO_WHITELIST   -5
+
+header XXXPRON     subject =~ /\bxxx\b/i
+score  XXXPRON     8.0
+
+header __MENTORSRFS1  ToCc =~ /debian-mentors\@lists\.debian\.org/
+header __MENTORSRFS2   subject =~ /\bRFS\b/
+meta   MENTORSRFS  (__MENTORSRFS1 && __MENTORSRFS2)
+describe MENTORSRFS This mail might be a request for sponsorship on mentors
+score  MENTORSRFS   -0.3
+
+header __DEVELITP1  ToCc =~ /debian-devel\@lists\.debian\.org/
+header __DEVELITP2   subject =~ /\bITP:\b/
+meta   DEVELITP  (__DEVELITP1 && __DEVELITP2)
+describe MENTORSRFS This mail might be an ITP on d-devel
+score  MENTORSRFS   -0.3
+
+header SUBCHANGES  subject =~ /Daily un\/subscription report/i
+describe SUBCHANGES Subscriber Changes for all lists sent to listmasters
+score  SUBCHANGES  -10