X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=97b96cb6652af61c63f2a4f0c47bea5a8f93a25a;hb=99c219736c3c52f933f120c4411ef8e984f5f9d1;hp=53fad43b65c1b5ddb03ab639770fd954da6d86da;hpb=a0ef23766b413e3aebbfbfceff40610af594dadd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 53fad43b6..97b96cb66 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -289,6 +289,13 @@ acl_getprofile:
           hosts          = !+debianhosts
           set acl_m_rprf = localonly
 
+<%- if nodeinfo['mailrelay'] -%>
+  warn    local_parts    = +local_only_users
+          domains        = +mailhubdomains
+          hosts          = !+debianhosts
+          set acl_m_rprf = localonly
+
+<%- end -%>
   accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 
 <%- if nodeinfo['rtmaster'] -%>
@@ -621,13 +628,6 @@ check_recipient:
 	  hosts         = !+debianhosts
 	  message       = mail from <$sender_address> not allowed externally
 
-<%- if nodeinfo['mailrelay'] -%>
-  deny    local_parts   = +local_only_users
-          domains       = +mailhubdomains
-          !hosts        = +debianhosts
-          message       = mail for <$local_part@$domain> not allowed externally
-
-<%- end -%>
   deny    condition     = ${if match_domain{$sender_address_domain}{+virtual_domains}{1}{0}}
           condition     = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}}
           condition     = ${if match_local_part {$sender_address_local_part}{${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}}