From: Stephen Gran <steve@lobefin.net>
Date: Fri, 7 Jan 2011 08:21:37 +0000 (+0000)
Subject: add support back for .forward-foo and .procmailrc directly to @d.o on master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=10db9124251e0d9944453420ada4e77c97f12780;p=mirror%2Fdsa-puppet.git

add support back for .forward-foo and .procmailrc directly to @d.o on master

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index f5a7e7d21..088be37df 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1133,7 +1133,11 @@ userforward_verify:
   user = Debian-exim
   no_check_local_user
   directory_transport = address_directory
+<%- if hostname == "master.debian.org -%>
+  domains = +local_domains : debian.org
+<%- else -%>
   domains = +local_domains
+<%- end -%>
   # filter - I have disabled filtering to force users to use .forward-foo files
   # or procmail. This will make it easier to move mailers in the future
   #
@@ -1163,7 +1167,11 @@ userforward:
   check_ancestor
   check_local_user
   directory_transport = address_directory
+<%- if hostname == "master.debian.org -%>
+  domains = +local_domains : debian.org
+<%- else -%>
   domains = +local_domains
+<%- end -%>
   # filter - I have disabled filtering to force users to use .forward-foo files
   # or procmail. This will make it easier to move mailers in the future
   #
@@ -1191,7 +1199,11 @@ procmail:
   debug_print = "R: procmail for $local_part@$domain"
   driver = accept
   check_local_user
+<%- if hostname == "master.debian.org -%>
+  domains = +local_domains : debian.org
+<%- else -%>
   domains = +local_domains
+<%- end -%>
   headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
   local_part_suffix = -*
   local_part_suffix_optional