From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri, 18 Oct 2019 20:58:03 +0000 (+0100)
Subject: exim: use a different local part suffix for tracker virtual users
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4f011cbc16fddc4f475bf40ae11e3407bd4ac1dc;p=mirror%2Fdsa-puppet.git

exim: use a different local part suffix for tracker virtual users

Part of RT#7283

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 16516ac71..be53a5489 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1484,7 +1484,11 @@ virt_direct_verify:
   modemask = 002
   directory_transport = address_directory
   domains = +virtual_domains
+<%- if @is_trackermaster -%>
+  local_part_suffix = +*
+<%- else -%>
   local_part_suffix = -*
+<%- end -%>
   local_part_suffix_optional
   file = $home/.forward-\
               ${if exists {${home}/.forward-${local_part}}{${local_part}}\
@@ -1514,7 +1518,11 @@ virt_direct:
   group = ${extract{group}{VDOMAINDATA}}
   headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
   modemask = 002
+<%- if @is_trackermaster -%>
+  local_part_suffix = +*
+<%- else -%>
   local_part_suffix = -*
+<%- end -%>
   local_part_suffix_optional
   pipe_transport = address_pipe
   reply_transport = address_reply