From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri, 25 Oct 2019 16:49:10 +0000 (+0100)
Subject: eximconf: use "add_header" when the intent is to add headers
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c888c37605afc9df975cb77e237a054af392163a

eximconf: use "add_header" when the intent is to add headers

The "message" modifier for the "warn" verb can still be used to add
headers, but it's more obvious to use add_header explicitly

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 c619856ce..1441c9b6a 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -725,7 +725,7 @@ check_recipient:
 <%- if @is_packagesmaster -%>
   warn    condition      = ${if eq {$acl_m_prf}{PackagesMail}}
           condition      = ${if eq {$sender_address}{$local_part@$domain}}
-          message        = X-Packages-FromTo-Same: yes
+          add_header     = X-Packages-FromTo-Same: yes
 
 <%- end -%>
   deny    condition      = ${if !eq {$acl_m_prf}{PopconMail}}
@@ -993,7 +993,7 @@ acl_check_mime:
          condition     = ${if eq {$acl_m_prf}{markup}}
          set acl_m_srb = ${perl{surblspamcheck}}
          condition     = ${if !eq{$acl_m_srb}{false}}
-         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
+         add_header    = X-Surbl-Hit: $primary_hostname: $acl_m_srb
 
   # Dump MIME parts to disk. "default" creates sequentially-named files
   # in <spool_directory>/scan/<message_id>/ which should then be