From: Stephen Gran <steve@lobefin.net>
Date: Sat, 4 Sep 2010 13:47:39 +0000 (+0100)
Subject: fix rbl and rhsbl list handling
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=477a3c8908203389736d455bc17a7952ee296073;p=mirror%2Fdsa-puppet.git

fix rbl and rhsbl list handling

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index d652d6b4c..23a57e34c 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -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