X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/b4208cbbba89b45b31775945a714f87c3d8261ec..693207d163d5bd971c6025dffda6992523b9332c:/spamassassin/user_prefs

diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index 7aa67c5..84ee15e 100644
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -45,9 +45,8 @@ report_safe_copy_headers X-Greylist
 rewrite_header SUBJECT
 
 #bayes_path ~/.var/spamassassin/bayes
-bayes_auto_learn 1
+bayes_auto_learn 0
 bayes_ignore_header X-Original-To
-bayes_ignore_header X-Original-To-Saved #
 bayes_ignore_header X-EqDomain
 bayes_ignore_header X-EqTo
 bayes_ignore_header X-Been-There
@@ -59,9 +58,9 @@ bayes_ignore_header X-CRM114-Status
 bayes_ignore_header X-CRM114-CacheID
 bayes_ignore_header X-CRM114-Notice
 bayes_ignore_header X-CRM114-Version
-bayes_ignore_header X-Sender-IP #
-bayes_ignore_header X-CIDR #
-bayes_ignore_header X-ASN #
+#bayes_ignore_header X-Sender-IP #
+#bayes_ignore_header X-CIDR #
+#bayes_ignore_header X-ASN #
 bayes_ignore_header X-Spam-Relays-External 
 bayes_ignore_header X-Spam-Relays-Internal
 bayes_ignore_header X-Spam-Relays-Trusted
@@ -69,6 +68,12 @@ bayes_ignore_header X-Spam-Relays-Untrusted
 bayes_ignore_header X-Spam-Status
 bayes_ignore_header X-Spam-Bayes
 bayes_ignore_header X-Spam-Level
+bayes_ignore_header X-Spam
+bayes_ignore_header X-Justme
+bayes_ignore_header X-Tickle
+bayes_ignore_header X-Delayed
+bayes_ignore_header X-Resubmitted
+bayes_ignore_header X-Trained-As
 bayes_ignore_from add@ress.com #
 bayes_learn_to_journal 1
 
@@ -84,20 +89,20 @@ add_header all Relays-Untrusted _RELAYSUNTRUSTED_
 #trusted_networks 127.
 # madduck.net
 trusted_networks 130.60.75.72 82.197.162.59 213.203.238.82
-# debian: gluck master murphy spohr rietz
-trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43
+# debian: gluck master murphy spohr rietz liszt
+trusted_networks 192.25.206.10 70.103.162.29 70.103.162.31 192.25.206.33 140.211.166.43 82.195.75.100
 # debian: alioth
 trusted_networks 217.196.43.134
-# ifi: bela miraculix
-trusted_networks 130.60.156.10 130.60.156.214
+# ifi: bela miraculix nicolai
+trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10
 # ailab: gaia
 trusted_networks 130.60.75.60
 # fortytwo
 trusted_networks 193.138.215.60
 # aerasec: all of MNET-AERASEC
 trusted_networks 212.18.21.160/26
-# swat: osprey.sccs
-trusted_networks 130.58.218.6
+# swat: osprey.sccs, heron.sccs
+trusted_networks 130.58.218.6 130.58.218.10
 # acm
 trusted_networks 63.118.7.109
 # skynet: calculon gir