From: Stephen Gran <steve@lobefin.net>
Date: Sun, 21 Jun 2009 12:58:33 +0000 (+0100)
Subject: Named variables for localonly mail
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=49fbaee9b384e149d252323ca150d42c7c6a8d3e;p=mirror%2Fdsa-puppet.git

Named variables for localonly mail
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 38e89bd77..5a46c7cc9 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -521,20 +521,20 @@ out
           condition     = ${if match_local_part {$sender_address_local_part}{${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}}
 	  message       = no mail should ever come from <$sender_address>
 
-  warn    condition     = ${if eq{$acl_m6}{}}
+  warn    condition     = ${if eq{$acl_m_lcl}{}}
           acl           = acl_localonly
-          set acl_m6    = localonly
-          set acl_m7    = ${if eq{$acl_m7}{}{$local_part@$domain}{$acl_m7, $local_part@$domain}}
+          set acl_m_lcl = localonly
+          set acl_m_lrc = ${if eq{$acl_m_lrc}{}{$local_part@$domain}{$acl_m_lrc, $local_part@$domain}}
 
-  warn    condition     = ${if eq{$acl_m6}{}}
+  warn    condition     = ${if eq{$acl_m_lcl}{}}
           !acl          = acl_localonly
-          set acl_m6    = normal
+          set acl_m_lcl = normal
 
-  defer   condition     = ${if eq{$acl_m6}{localonly}}
+  defer   condition     = ${if eq{$acl_m_lcl}{localonly}}
           !acl          = acl_localonly
           log_message   = Only one profile at a time, please
 
-  defer   condition     = ${if eq{$acl_m6}{normal}}
+  defer   condition     = ${if eq{$acl_m_lcl}{normal}}
           acl           = acl_localonly
           log_message   = Only one profile at a time, please
 
@@ -809,8 +809,8 @@ out
 %>
 
 acl_check_predata:
-  deny   condition     = ${if eq{$acl_m6}{localonly}}
-         message       = mail for $acl_m7 is only accepted internally
+  deny   condition     = ${if eq{$acl_m_lcl}{localonly}}
+         message       = mail for $acl_m_lrc is only accepted internally
 
   accept