X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/a65d564b84acb5ab76b4e8581fa01de62646fb45..151dbda94e83d57109377b2d32b2808da230ed27:/spamassassin/user_prefs

diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index 4965e1c..b943195 100644
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -36,8 +36,6 @@
 
 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
@@ -86,29 +84,25 @@ 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 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
+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 nicolai
-trusted_networks 130.60.156.10 130.60.156.214 130.60.155.10
-# 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, heron.sccs
 trusted_networks 130.58.218.6 130.58.218.10
-# acm
-trusted_networks 63.118.7.109
 # 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
 
@@ -122,7 +116,7 @@ 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/
@@ -149,3 +143,6 @@ 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