From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 20 Mar 2016 08:53:19 +0000 (+0100)
Subject: Re-enable surbl checks, and set {keep,add}_environment to empty values
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=0947adb3bc0ec1558918f3f080a28cfff0c85030

Re-enable surbl checks, and set {keep,add}_environment to empty values
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 4158ff9c5..9dc92818a 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -77,7 +77,7 @@
 ######################################################################
 
 <%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%>
-# perl_startup = do '/etc/exim4/exim_surbl.pl'
+ perl_startup = do '/etc/exim4/exim_surbl.pl'
 <%- end -%>
 
 # These options specify the Access Control Lists (ACLs) that
@@ -269,6 +269,9 @@ GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\
                        ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-greylist}{$local_part}{}}
 RT_QUEUE_MAP = /srv/rt.debian.org/mail/rt_queue_map
 
+keep_environment =
+add_environment =
+
 ######################################################################
 #                        ACL CONFIGURATION                           #
 ######################################################################
@@ -868,25 +871,25 @@ acl_check_mime:
  accept  verify        = certificate
  accept  hosts         = +debianhosts
 
-# discard condition     = ${if <{$message_size}{256000}}
-#         condition     = ${if eq {$acl_m_prf}{blackhole}}
-#         set acl_m_srb = ${perl{surblspamcheck}}
-#         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-#         log_message   = discarded surbl message for $recipients
-#
-#  deny   condition     = ${if <{$message_size}{256000}}
-#         condition     = ${if eq {$acl_m_prf}{markup}{no}{yes}}
-#         condition     = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}}
-#         set acl_m_srb = ${perl{surblspamcheck}}
-#         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-#         log_message   = $acl_m_srb
-#         message       = $acl_m_srb
-#
-#  warn   condition     = ${if <{$message_size}{256000}}
-#         condition     = ${if eq {$acl_m_prf}{markup}}
-#         set acl_m_srb = ${perl{surblspamcheck}}
-#         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-#         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
+ discard condition     = ${if <{$message_size}{256000}}
+         condition     = ${if eq {$acl_m_prf}{blackhole}}
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         log_message   = discarded surbl message for $recipients
+
+  deny   condition     = ${if <{$message_size}{256000}}
+         condition     = ${if eq {$acl_m_prf}{markup}{no}{yes}}
+         condition     = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}}
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         log_message   = $acl_m_srb
+         message       = $acl_m_srb
+
+  warn   condition     = ${if <{$message_size}{256000}}
+         condition     = ${if eq {$acl_m_prf}{markup}}
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
 
   accept
 
@@ -972,25 +975,25 @@ check_message:
 
 <%- end -%>
 <%- if scope.lookupvar('site::nodeinfo').has_key?('heavy_exim') and scope.lookupvar('site::nodeinfo')['heavy_exim'] -%>
-# discard condition     = ${if <{$message_size}{256000}}
-#         condition     = ${if eq {$acl_m_prf}{blackhole}}
-#         set acl_m_srb = ${perl{surblspamcheck}}
-#         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-#         log_message   = discarded surbl message for $recipients
-#
-#  deny   condition     = ${if <{$message_size}{256000}}
-#         condition     = ${if eq {$acl_m_prf}{markup}{no}{yes}}
-#         condition     = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}}
-#         set acl_m_srb = ${perl{surblspamcheck}}
-#         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-#         log_message   = $acl_m_srb
-#         message       = $acl_m_srb
-#
-#  warn   condition     = ${if <{$message_size}{256000}}
-#         condition     = ${if eq {$acl_m_prf}{markup}}
-#         set acl_m_srb = ${perl{surblspamcheck}}
-#         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-#         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
+ discard condition     = ${if <{$message_size}{256000}}
+         condition     = ${if eq {$acl_m_prf}{blackhole}}
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         log_message   = discarded surbl message for $recipients
+
+  deny   condition     = ${if <{$message_size}{256000}}
+         condition     = ${if eq {$acl_m_prf}{markup}{no}{yes}}
+         condition     = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}}
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         log_message   = $acl_m_srb
+         message       = $acl_m_srb
+
+  warn   condition     = ${if <{$message_size}{256000}}
+         condition     = ${if eq {$acl_m_prf}{markup}}
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
 
 <%- end -%>
   # Check header_sender except for survey@popcon.d.o