X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/b6c5281d8be45d403f8492a3dbd433f3c12b2cfb..a45c47a17cadc5e094efc9d23731c0a025294be4:/spamassassin/user_prefs diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs index ed6683c..f12ea28 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,9 +84,11 @@ add_header all Relays-Untrusted _RELAYSUNTRUSTED_ # the local host #trusted_networks 127. # madduck.net -trusted_networks 213.203.238.82 [2001:6f8:128a::1]/64 193.242.105.96 193.242.105.183 [2001:41e0:ff43::1]/64 +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 [2001:8d8:80:11::35d] +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 sergei @@ -96,29 +96,28 @@ 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 [2001:a60:9002:1::]/64 +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