eximconf: standardise on acl_m_body

[mirror/dsa-puppet.git] / modules / exim / templates / eximconf.erb

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5e45b15..b6dee2a 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -107,7 +107,7 @@ allow_domain_literals = true
 # local_domains. It will be referenced
 # later on by the syntax "+local_domains".
 # Other domain and host lists may follow.
-# @ is the local FQDN, @[] matches the IP adress of any local interface.
+# @ is the local FQDN, @[] matches the IP address of any local interface.
 
 domainlist local_domains = @ : \
     @[] : \
@@ -1072,10 +1072,23 @@ check_message:
           condition       = ${if !eq {$acl_m_prf}{PopconMail}}
          message         = Your mailer is not RFC 2047 compliant: message rejected
 
+  deny    condition       = ${if match {$rh_Received:}{\N from [^ ]+\.example\.com \N}}
+          log_message     = Implausible Received header
+          message         = Header problem: message rejected
+
+  warn    set acl_m_body = ${sg{$message_body}{= }{}}
+
   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 {$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}} \
                                    }\
                             }
           set acl_m_content = 1