From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Tue, 10 Dec 2019 22:07:23 +0000 (+0000)
Subject: eximconf: standardise on acl_m_body
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=05a25ce36b86980a49aee76e839c0b02e0d497c9

eximconf: standardise on acl_m_body

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 00ac38119..b6dee2afe 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1080,12 +1080,12 @@ check_message:
 
   warn    condition      = ${if bool_lax{$acl_m_defopt}}
           condition      = ${if or {\
-                                    {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
-                                    {match {$message_body}{\N(?i)Dear Beneficiary.*You have been selected.*Thousand United States Dollars\N}} \
-                                    {match {$message_body}{\N(?i)receiving sum of money into your account for safe keeping\N}} \
-                                    {match {$message_body}{\N(?i)I got your e-mail address through an internet marketing firm\N}} \
-                                    {match {$message_body}{\N(?i)De conformidad con lo establecido en la Ley 34/2002 Lssice le comunicamos que este escrito procede de Search Task\N}} \
-                                    {match {$message_body}{\NIf you are already our customer then please ignore this email\N}} \
+                                    {match {$acl_m_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
+                                    {match {$acl_m_body}{\N(?i)Dear Beneficiary.*You have been selected.*Thousand United States Dollars\N}} \
+                                    {match {$acl_m_body}{\N(?i)receiving sum of money into your account for safe keeping\N}} \
+                                    {match {$acl_m_body}{\N(?i)I got your e-mail address through an internet marketing firm\N}} \
+                                    {match {$acl_m_body}{\N(?i)De conformidad con lo establecido en la Ley 34/2002 Lssice le comunicamos que este escrito procede de Search Task\N}} \
+                                    {match {$acl_m_body}{\NIf you are already our customer then please ignore this email\N}} \
                                     {match {$acl_m_body}{\N\.debian\.org Webmail Administrator\N}} \
                                     {match {$acl_m_body}{\N<META name=3D"GENERATOR" content=3D"-\[OUTLOOK_VER\]-">\N}} \
                                     {match {$acl_m_body}{\NAll words on this page are an ad that was sent-to you\N}} \