From bf7bc9b417ad6200ee25094b85fd7508c7a18226 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 19 Feb 2012 09:49:36 +0000 Subject: [PATCH] this is a better way to do it Signed-off-by: Stephen Gran --- modules/exim/templates/eximconf.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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}} -- 2.20.1