From: Stephen Gran <steve@lobefin.net>
Date: Sun, 18 Apr 2010 10:57:06 +0000 (+0100)
Subject: clean up the inevitable things that went wrong
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b939e791538ef9e723a8180617e73f7d4bddd37b;p=dsa-puppet.git

clean up the inevitable things that went wrong

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

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 37d576f7..a6e2bc3d 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -745,7 +745,7 @@ check_recipient:
                          ${readsocket{/var/run/postgrey/socket}{$acl_m_pgr}\
                                {5s}{}{action=DUNNO}}\
                      }{action=}{}}
-    message        = ${sg{$acl_m_pgr}{^\\\\w+\\\\s*}{}}
+    message        = ${sg{$acl_m_pgr}{^\\w+\\s*}{}}
     log_message    = greylisted.
     condition      = ${if eq{${uc:${substr{0}{5}{$acl_m_pgr}}}}{DEFER}}
 
@@ -758,7 +758,7 @@ check_recipient:
     domains        = +handled_domains
     local_parts    = GREYLIST_LOCAL_PARTS
     condition      = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
-    message        = ${sg{$acl_m_pgr}{^\\\\w+\\\\s*}{}}
+    message        = ${sg{$acl_m_pgr}{^\\w+\\s*}{}}
 
 <% end %>
 
@@ -1457,7 +1457,7 @@ remote_smtp:
   driver = smtp
   connect_timeout = 1m
   delay_after_cutoff = false
-<% if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" %>
+<%= if has_variable?("exim_ssl_certs") && exim_ssl_certs == "true" %>
   tls_certificate = /etc/exim4/ssl/thishost.crt
   tls_privatekey = /etc/exim4/ssl/thishost.key
 <% end %>