X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=lists%2Fuser_prefs;h=ce667dae8c42a8fd1e28986b789611529bb0dc76;hp=6ea30c2b14332f884ad7f3d19071924d6a6e0252;hb=fde808d3090d7c16793652d06ed84c600adc3ab7;hpb=cc7faf272c062f016cd29db52bebde8f16e7dd7f

diff --git a/lists/user_prefs b/lists/user_prefs
index 6ea30c2..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
@@ -31,7 +31,7 @@ use_pyzor		1
 # testing only --joy, 2003-09-05
 # we have non english lists on lists.d.o --rmurray, 2003-12-03
 # which is why the scores are divided with a hundred, duh --joy, 2004-05-27
-ok_locales              en
+#ok_locales              en
 # ok_languages            en
 
 # good idea, should have been taken further, but preemptively
@@ -44,25 +44,27 @@ ok_locales              en
 # 
 # set more realistic settings, so bayes is not automatic poisoned any more
 #                 -- zobel, 2207-01-13
-bayes_auto_learn_threshold_nonspam  -5
+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)
 ################################################################
 
-include /var/list/.spamassassin/sare-rules/70_sare_adult.cf
-include /var/list/.spamassassin/sare-rules/70_sare_header0.cf
-include /var/list/.spamassassin/sare-rules/70_sare_header1.cf
-include /var/list/.spamassassin/sare-rules/70_sare_html0.cf
-include /var/list/.spamassassin/sare-rules/70_sare_html1.cf
-include /var/list/.spamassassin/sare-rules/70_sare_oem.cf
-include /var/list/.spamassassin/sare-rules/70_sare_specific.cf
-include /var/list/.spamassassin/sare-rules/70_sare_stocks.cf
-include /var/list/.spamassassin/sare-rules/72_sare_bml_post25x.cf
-include /var/list/.spamassassin/sare-rules/75_black_uri_list.cf
-include /var/list/.spamassassin/sare-rules/99_sare_fraud_post25x.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_adult.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_header0.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_header1.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_html0.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_html1.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_oem.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_specific.cf
+#include /var/list/.spamassassin/sare-rules/70_sare_stocks.cf
+#include /var/list/.spamassassin/sare-rules/72_sare_bml_post25x.cf
+#include /var/list/.spamassassin/sare-rules/75_black_uri_list.cf
+#include /var/list/.spamassassin/sare-rules/99_sare_fraud_post25x.cf
 
 
 ################################################################
@@ -78,8 +80,54 @@ 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
 
+include common/sare/70_sare_adult.cf
+include common/sare/70_sare_header0.cf
+include common/sare/70_sare_header1.cf
+include common/sare/70_sare_header2.cf
+include common/sare/70_sare_header3.cf
+include common/sare/70_sare_header.cf
+include common/sare/70_sare_header_eng.cf
+include common/sare/70_sare_html0.cf
+include common/sare/70_sare_html1.cf
+include common/sare/70_sare_html2.cf
+include common/sare/70_sare_html3.cf
+include common/sare/70_sare_html4.cf
+include common/sare/70_sare_html.cf
+include common/sare/70_sare_oem.cf
+include common/sare/70_sare_specific.cf
+include common/sare/70_sare_spoof.cf
+include common/sare/70_sare_stocks.cf
+include common/sare/72_sare_bml_post25x.cf
+include common/sare/99_sare_fraud_post25x.cf
+
 # Include common spam stuff
 
 include common/common_spam
 include common/list_specific
 include common/scores
+
+header EXINNEN From =~ /schilling\@fokus\.fraunhofer\.de/i
+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