From: Stephen Gran <steve@lobefin.net>
Date: Fri, 30 Oct 2009 22:22:57 +0000 (+0000)
Subject: machines that smarthost in and out don't need to accept mail from the interwebs
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6965541b55a031e8f858c5cb3b4485bc06013b76;p=mirror%2Fdsa-puppet.git

machines that smarthost in and out don't need to accept mail from the interwebs

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index db3674cbc..70ec3f44c 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -413,7 +413,6 @@ out
 %>
 
 <%= 
-out = ""
 if nodeinfo['smarthost'].empty?
   out = '
   # These are in HELO acl so that they are only run once.  They increment a counter,
@@ -491,6 +490,10 @@ if nodeinfo['smarthost'].empty?
        log_message     = random HELO
        set acl_c_scr   = ${eval:$acl_c_scr+5}
 '
+else
+  out = '
+  defer !hosts         = +debianhosts
+'
 end
 out
 %>