X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=23a57e34cf2794abc7410710bee0255db71e0ab1;hb=fa01e3068e4b799a4ca7482e6c8470f7e2cadb3f;hp=2bf90c7c11c87c197ac10ef0c7f67f9970d382c3;hpb=82efd346ca1500048366eac43d191c1a2a7d01fc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 2bf90c7c1..23a57e34c 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -249,9 +249,9 @@ received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n
 # Do not wrap!
 VDOMAINDATA = ${lookup{$domain}partial-lsearch{/etc/exim4/virtualdomains}{$value}}
 WHITELIST = ${if match_domain{$domain}{+virtual_domains}\
-            {${if exists {${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}
+            {${if exists {${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}\
             {${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}{$value}{}}}{}}}\
-            {${lookup{$local_part}lsearch{/etc/exim4/whitelist}{$value}{}}}} : \
+            {/etc/exim4/whitelist} } : \
             ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-whitelist}{$value}{}}
 GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\
                        {${if exists {${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}\
@@ -804,8 +804,8 @@ check_recipient:
           dnslists = ${if match_domain{$domain}{+virtual_domains}\
 		     {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}\
 		     {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}{$value}{}}}{}}}\
-		     {${lookup{$local_part}lsearch{/etc/exim4/rbllist}{$value}{}} : \
-		     ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-rbl}{$value}{}}}}
+		     {${lookup{$local_part}lsearch{/etc/exim4/rbllist}{$value}{}}}} : \
+		     ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-rbl}{$value}{}}
 	  domains       = +handled_domains
 	  !hosts        = +debianhosts : WHITELIST
 
@@ -814,8 +814,8 @@ check_recipient:
           dnslists = ${if match_domain{$domain}{+virtual_domains}\
 		     {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rhsbllist}}}\
 		     {${expand:${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/rhsbllist}}}{$value}{}}}}{}}}\
-		     {${expand:${lookup{$local_part}lsearch{/etc/exim4/rhsbllist}{$value}{}}} : \
-		     ${expand:${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-rhsbl}{$value}{}}}}}
+		     {${expand:${lookup{$local_part}lsearch{/etc/exim4/rhsbllist}{$value}{}}}}} : \
+		     ${expand:${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-rhsbl}{$value}{}}}
 	  domains       = +handled_domains
 	  !hosts        = +debianhosts : WHITELIST