From: Stephen Gran <steve@lobefin.net>
Date: Sat, 23 May 2009 11:36:57 +0000 (+0100)
Subject: Revert "Revert "And another acl for exim"+1"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=19a3080140f945d689913c3c64b626706a416d27;p=mirror%2Fdsa-puppet.git

Revert "Revert "And another acl for exim"+1"

This reverts commit 4cb5fb5099d0c7177bce071920cecea8dcdda873.
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 818d7789c..d94096274 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -101,6 +101,13 @@ out
 acl_smtp_helo = check_helo
 acl_smtp_rcpt = ${if ={$interface_port}{587} {check_submission}{check_recipient}}
 acl_smtp_data = check_message
+<%=
+out=''
+if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty?
+  out = "acl_smtp_mime = acl_check_mime"
+end
+out
+%>
 
 # accept domain literal syntax in e-mail addresses. To actually make use of
 # this a router is also required
@@ -763,6 +770,22 @@ out
 
   deny    message = relay not permitted
 
+<%=
+out=''
+if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty?
+out='
+acl_check_mime:
+
+  deny   condition     = ${if <{$message_size}{256000}}
+         set acl_m5    = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m5}{false}{no}{yes}}
+         log_message   = $acl_m5
+         message       = $acl_m5
+'
+end
+out
+%>
+
 #!!# ACL that is used after the DATA command
 check_message:
   require verify = header_syntax