]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Named variables for surbl
authorStephen Gran <steve@lobefin.net>
Sun, 21 Jun 2009 12:31:12 +0000 (13:31 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 21 Jun 2009 12:31:12 +0000 (13:31 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/exim/templates/eximconf.erb

index 2500496298978e5667bdc5804bc31f8b404b64a0..011423b93122b84395e745d0be88cf46c81c7b5f 100644 (file)
@@ -797,10 +797,10 @@ 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
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         log_message   = $acl_m_srb
+         message       = $acl_m_srb
 
   accept
 '
@@ -889,9 +889,10 @@ out=''
 if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty?
 out='
   deny   condition     = ${if <{$message_size}{256000}}
-         set acl_m5    = ${perl{surblspamcheck}}
-         condition     = ${if eq{$acl_m5}{false}{no}{yes}}
-         log_message   = $acl_m5
+         set acl_m_srb = ${perl{surblspamcheck}}
+         condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
+         log_message   = $acl_m_srb
+         message       = $acl_m_srb
 '
 end
 out