X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/6a16951301e86b773e44ae87faa8154489cfe197..f08fc321b1e63e3f8b5cbf0de79e33e7da13de33:/spamassassin/user_prefs

diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index 09bed7c..1b02c64 100644
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -58,9 +58,6 @@ 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
@@ -69,13 +66,14 @@ 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-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_ignore_from add@ress.com #
 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_
@@ -89,20 +87,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
@@ -151,3 +149,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