Fix resolv.conf.erb to work with no nameservers when we have a local recursor

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 2667f60..428e356 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -526,6 +526,7 @@ check_recipient:
           set acl_m_prf = $acl_m_rprf
 
   defer   condition     = ${if eq{$acl_m_prf}{$acl_m_rprf}{no}{yes}}
+          message       = Different profile, please retry
           log_message   = Only one profile at a time, please
 
   # Defer after too many bad RCPT TO's.  Legit MTAs will retry later.
@@ -628,12 +629,6 @@ check_recipient:
   warn    condition     = ${if eq{$acl_m_prf}{localonly}}
           set acl_m_lrc = ${if eq{$acl_m_lrc}{}{$local_part@$domain}{$acl_m_lrc, $local_part@$domain}}
 
-<%- if 0 == 1 -%>
-  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 -%>
 <%- if nodeinfo['packagesmaster'] -%>
   warn    condition      = ${if eq {$acl_m_prf}{PackagesMail}}
           condition      = ${if eq {$sender_address}{$local_part@$domain}}