From: Stephen Gran <steve@lobefin.net>
Date: Sun, 4 Oct 2009 23:23:34 +0000 (+0100)
Subject: eliminate lots of spam stuff for smarthosting machines
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2bd0f7f35308dede2a5c8fa98a69c0ed5bc7045a;p=mirror%2Fdsa-puppet.git

eliminate lots of spam stuff for smarthosting machines

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 26727a34b..0eaa935d1 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -414,6 +414,10 @@ end
 out
 %>
 
+<%= 
+out = ""
+if nodeinfo['smarthost'].empty?
+  out = "
   # These are in HELO acl so that they are only run once.  They increment a counter,
   # so we don't want it to increment per rcpt to.
 
@@ -488,6 +492,9 @@ out
        condition       = ${if match {${lc:$sender_helo_name}}{\N.*[bcdfghjklmnpqrstvwxz]{7,}.*\.[a-z]+$\N}}
        log_message     = random HELO
        set acl_c_scr   = ${eval:$acl_c_scr+5}
+"
+out
+%>
 
   # Implicit, but simpler to just say it
   accept