diff options
| author | root <root@jones.dk> | 2016-10-25 18:44:40 +0200 |
|---|---|---|
| committer | root <root@jones.dk> | 2016-10-25 18:44:40 +0200 |
| commit | 60f00c0836e5ad590af2e8100d2c14466a9b67af (patch) | |
| tree | 39f82e6d36afc6f7740727da8176f07cf37ddb54 | |
| parent | 5756ac4a3bd5abfac52aadba8daa874bbacbf89d (diff) | |
Resolve and (as sample) set whitelist_bounce_relays.
| -rw-r--r-- | spamassassin/local.cf | 1 | ||||
| -rw-r--r-- | spamassassin/local.cf.diff | 9 | ||||
| -rwxr-xr-x | spamassassin/tweak.d/networks.sh | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/spamassassin/local.cf b/spamassassin/local.cf index 96f52e9..530caa5 100644 --- a/spamassassin/local.cf +++ b/spamassassin/local.cf @@ -23,6 +23,7 @@ report_safe 0 # internal_networks 127.0.0.1 188.183.5.254/32 trusted_networks 127.0.0.1 188.183.5.254/32 80.68.88.141/32 217.197.91.142 94.18.231.208/29 146.185.137.224 +whitelist_bounce_relays mail.bitbase.dk mail.free-owl.de mail.homebase.dk mail.copyninja.info # Set file-locking method (flock is not safe over NFS, but is faster) diff --git a/spamassassin/local.cf.diff b/spamassassin/local.cf.diff index b43925e..2c236b7 100644 --- a/spamassassin/local.cf.diff +++ b/spamassassin/local.cf.diff @@ -1,6 +1,6 @@ --- local.cf.orig 2016-10-24 21:29:10.000000000 +0200 -+++ local.cf 2016-10-25 18:12:59.000000000 +0200 -@@ -15,18 +15,19 @@ ++++ local.cf 2016-10-25 18:43:20.000000000 +0200 +@@ -15,18 +15,20 @@ # Save spam messages as a message/rfc822 MIME attachment instead of # modifying the original message (0: off, 2: use text/plain instead) # @@ -14,6 +14,7 @@ -# trusted_networks 212.17.35. +internal_networks 127.0.0.1 188.183.5.254/32 +trusted_networks 127.0.0.1 188.183.5.254/32 80.68.88.141/32 217.197.91.142 94.18.231.208/29 146.185.137.224 ++whitelist_bounce_relays mail.bitbase.dk mail.free-owl.de mail.homebase.dk mail.copyninja.info # Set file-locking method (flock is not safe over NFS, but is faster) @@ -23,7 +24,7 @@ # Set the threshold at which a message is considered spam (default: 5.0) -@@ -55,7 +56,7 @@ +@@ -55,7 +57,7 @@ # Whether to decode non- UTF-8 and non-ASCII textual parts and recode # them to UTF-8 before the text is given over to rules processing. # @@ -32,7 +33,7 @@ # Some shortcircuiting, if the plugin is enabled # -@@ -87,3 +88,12 @@ +@@ -87,3 +89,12 @@ # shortcircuit BAYES_00 ham endif # Mail::SpamAssassin::Plugin::Shortcircuit diff --git a/spamassassin/tweak.d/networks.sh b/spamassassin/tweak.d/networks.sh index 7b4d56b..3b62edb 100755 --- a/spamassassin/tweak.d/networks.sh +++ b/spamassassin/tweak.d/networks.sh @@ -52,9 +52,11 @@ for realm in $REALMS; do [ ! -f "$realmdir/localnetworks" ] || ournets="${ournets:+$ournets }$(items "$realmdir/localnetworks")" else redpillnets="${redpillnets:+$redpillnets }$mailnets" + redpillhosts="${redpillhosts:+$redpillhosts }$(items "$realmdir/mailhost")" fi done echo "FIXME: Add these to /etc/spamassassin/local.cf:" echo "internal_networks $ournets" echo "trusted_networks $ournets $redpillnets" +echo "whitelist_bounce_relays $redpillhosts" |