Revert "And another acl for exim"+1

This reverts commits 3feb4c20b11b567a034e2ba06e45c066f380a4b9 and
b8fa816fa0c7ec2dc5d626b16ec4ef5f2afe1b6d.

These break some of our mail for now.

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index d94096274d9cca719660948ac96d0e09aa7481f3..818d7789ca77734098ddeede523f4b59967d24dc 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -101,13 +101,6 @@ 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
@@ -770,22 +763,6 @@ 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