Revert "And another acl for exim"+1

[mirror/dsa-puppet.git] / modules / exim / templates / eximconf.erb

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index b5c4d4e..818d778 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -86,7 +86,7 @@ out
 
 <%=
 out=''
-if not nodeinfo['heavy_exim'].empty?
+if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty?
   out = "
 perl_startup = do '/etc/exim4/exim_surbl.pl'
 "
@@ -511,9 +511,17 @@ out
           hosts         = !+debianhosts
          message       = mail for $local_part is only accepted internally
 
+<%=
+out=''
+if 0 == 1:
+out='
   deny    message  = address $sender_host_address is listed in $dnslist_domain; $dnslist_text
          hosts    = !+debianhosts
           dnslists = rbl.debian.net : rbl.debian.net/$sender_address_domain
+'
+end
+out
+%>
 
   deny    !recipients = survey@popcon.debian.org
           !verify = sender
@@ -522,7 +530,6 @@ out
           condition      = ${if >{${eval:$acl_c1}}{0}}
           ratelimit      = 10 / 60m / per_rcpt / $sender_host_address
           message        = slow down (no reverse dns, mismatched ehlo, dialup, or in blacklists)
-
 <%=
 out = ""
 if has_variable?("policydweight") && policydweight == "true"
@@ -836,7 +843,7 @@ out
 
 <%=
 out=''
-if not nodeinfo['heavy_exim'].empty?
+if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty?
 out='
   deny   condition     = ${if <{$message_size}{256000}}
          set acl_m5    = ${perl{surblspamcheck}}