X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=lists%2Fuser_prefs;h=ce667dae8c42a8fd1e28986b789611529bb0dc76;hp=1ffe214d726ac61c4256e689d5a28fefa50defe5;hb=de093869d8c92b582affd735f5cd58605451e1a1;hpb=3f736d226a8a6ff89836579af0761e68bb3c012b

diff --git a/lists/user_prefs b/lists/user_prefs
index 1ffe214..ce667da 100644
--- a/lists/user_prefs
+++ b/lists/user_prefs
@@ -16,8 +16,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,7 +47,7 @@ use_pyzor		1
 bayes_auto_learn_threshold_nonspam  -4
 bayes_auto_learn_threshold_spam      27
 
-subscriber_file /var/list/whitelist/dist
+subscriber_file /var/list/uniq-subscribers
 
 
 ################################################################
@@ -109,9 +109,25 @@ include common/scores
 header EXINNEN From =~ /schilling\@fokus\.fraunhofer\.de/i
 score EXINNEN 2.3
 
-header LDO_WHITELIST	eval:check_for_subscriber()
-description LDO_WHITELIST Subscribed to the whitelist
+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