From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 4 Feb 2015 19:32:03 +0000 (+0100)
Subject: postmasterish is not a spam trap, put that after host and sender address blacklist
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d117827ccb06fdfe2a81b14226d96446871a855e;p=mirror%2Fdsa-puppet.git

postmasterish is not a spam trap, put that after host and sender address blacklist
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 4a794e537..4afbb5b92 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -803,9 +803,6 @@ check_recipient:
     message        = ${sg{$acl_m_pgr}{^\\w+\\s*}{}}
 
 <%- end -%>
-  accept  local_parts   = +postmasterish
-          domains       = +virtual_domains : +bsmtp_domains
-
   deny    hosts        = ${if exists{/etc/exim4/host_blacklist}{/etc/exim4/host_blacklist}{}}
           message      = I'm terribly sorry, but it seems you have been blacklisted
           log_message  = blacklisted IP
@@ -814,6 +811,9 @@ check_recipient:
          senders       = ${if exists{/etc/exim4/blacklist}{/etc/exim4/blacklist}{}}
          message       = We have blacklisted <$sender_address>.  Please stop mailing us
 
+  accept  local_parts   = +postmasterish
+          domains       = +virtual_domains : +bsmtp_domains
+
 <%- if scope.lookupvar('site::nodeinfo')['smarthost'].empty? -%>
   deny    message  = host $sender_host_address is listed in $dnslist_domain; see $dnslist_text
           dnslists = ${if match_domain{$domain}{+virtual_domains}\