X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/3f50ac7647277d767ca20b0bc5b6846167342120..HEAD:/spamassassin/user_prefs

diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index ce75a0b..5a8f12c 100644
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -88,7 +88,7 @@ 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
+#trusted_networks 2001:41b8:202:deb:213:21ff:fe20:1426
 # debian: alioth
 trusted_networks 217.196.43.134
 # ifi: bela miraculix nicolai sergei
@@ -99,26 +99,25 @@ trusted_networks 193.138.215.60
 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
 
+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 de
 ok_languages en de
@@ -149,4 +148,4 @@ 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
+whitelist_bounce_relays clegg.madduck.net seamus.madduck.net swan.madduck.net