X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/be0c56b52025c2bca71c81b6b067dabd6fd5534a..039818c50e3af456c49a920ceaacdef62fa4ea14:/spamassassin/user_prefs

diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index 13b19bf..f12ea28 100644
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -36,31 +36,26 @@
 
 use_auto_whitelist 0
 
-focr_timeout 30
-
 report_safe 0
 report_safe_copy_headers X-CRM114-Status X-CRM114-Notice
 report_safe_copy_headers X-Greylist
 
 rewrite_header SUBJECT
 
-bayes_path ~/.var/spamassassin/bayes
-bayes_auto_learn 1
+#bayes_path ~/.var/spamassassin/bayes
+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
 bayes_ignore_header X-Delivered-To
 bayes_ignore_header X-Greylist
 bayes_ignore_header X-Virus-Scanned
+bayes_ignore_header X-Virus-Status
 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-Spam-Relays-External 
 bayes_ignore_header X-Spam-Relays-Internal
 bayes_ignore_header X-Spam-Relays-Trusted
@@ -68,8 +63,15 @@ 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_from add@ress.com #
+bayes_ignore_header X-Spam
+bayes_ignore_header X-Postponed
+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_learn_to_journal 1
+#bayes_ignore_from add@ress.com
 
 add_header all Status _YESNO_, score=_SCORE_/_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_
 add_header all Bayes score=_BAYES_ sum=_TOKENSUMMARY_ ham=_HAMMYTOKENS_ spam=_SPAMMYTOKENS_
@@ -82,43 +84,42 @@ add_header all Relays-Untrusted _RELAYSUNTRUSTED_
 # the local host
 #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
+trusted_networks 213.203.238.82 193.242.105.96 193.242.105.183
+# debian: gluck master murphy spohr rietz liszt powell
+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 87.106.64.223
+# liszt.debian.org
+#trusted_networks 2001:41b8:202:deb:213:21ff:fe20:1426
 # debian: alioth
 trusted_networks 217.196.43.134
-# ifi: bela miraculix
-trusted_networks 130.60.156.10 130.60.156.214
-# ailab: gaia
-trusted_networks 130.60.75.60
+# ifi: bela miraculix nicolai sergei
+trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10 130.60.155.11
 # 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
-# acm
-trusted_networks 63.118.7.109
+# swat: osprey.sccs, heron.sccs
+trusted_networks 130.58.218.6 130.58.218.10
 # skynet: calculon gir
 trusted_networks 193.1.99.88 193.1.99.77
 # ul: marshal4
 trusted_networks 193.1.100.137
-# ieee: ruebert
-trusted_networks 140.98.193.10
 # vger.kernel.org
 trusted_networks 209.132.176.167
 
+whitelist_from *master@*.*.madduck.net
 whitelist_from *master@*.madduck.net
 whitelist_from *master@madduck.net
+whitelist_from logcheck@*.*.madduck.net
 whitelist_from logcheck@*.madduck.net
 whitelist_from root@*.madduck.net
+whitelist_from root@*.*.madduck.net
 whitelist_from root@madduck.net
+whitelist_to root@*.madduck.net
+whitelist_to root@*.*.madduck.net
 whitelist_from *-owner@lists.madduck.net
 whitelist_to *-owner@lists.madduck.net
-whitelist_from *-owner@lists.ailab.ch
-whitelist_to *-owner@lists.ailab.ch
 
-ok_locales en
+ok_locales en de
 ok_languages en de
 
 header MADDUCK_IN_REFERENCES References =~ /madduck\.net/
@@ -141,7 +142,10 @@ meta L_drug_ws_obfu (__L_rp_drug_ws1 + __L_rp_drug_ws2 + __L_rp_drug_ws3 + __L_r
 score L_drug_ws_obfu 3
 
 # http://marc.info/?t=118544884300001&r=1&w=2
-rcore BAYES_60 0.0001 0.0001 1.5 1.5
+score BAYES_60 0.0001 0.0001 1.5 1.5
 score BAYES_80 0.0001 0.0001 2.5 2.5
 score BAYES_95 0.0001 0.0001 4.0 4.0
 score BAYES_99 0.0001 0.0001 5.0 5.0
+
+# VBounce
+whitelist_bounce_relays clegg.madduck.net seamus.madduck.net