From: Luca Filipozzi <lucaf@goofy.ece.ubc.ca>
Date: Wed, 22 Apr 2009 19:05:22 +0000 (-0700)
Subject: added router to handle foo+new@rt.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bbd65692ac82ca6ee5dfc5a32a66eec3a83bef44;p=mirror%2Fdsa-puppet.git

added router to handle foo+new@rt.debian.org
---

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index a31a29249..90d29ed03 100644
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -520,7 +520,7 @@ check_recipient:
 
   warn    domains  = rt.debian.org
           set acl_m1 = RTMail
-          set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if match{$local_part}{[^+]+\\+\\d+} {RTMailRecipientHasSubaddress}}}}
+          set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{[^+]+\\+\\d+}}{match{$local_part}{[^+]+\\+new}}} {RTMailRecipientHasSubaddress}}}}
 
   warn    domains  = packages.qa.debian.org
           set acl_m1 = PTSMail
@@ -993,7 +993,18 @@ bugs:
 .endif
 
 # This router delivers for rt.d.o
-rt:
+rt-force-new:
+  debug_print = "R: rt for $local_part+new@$domain"
+  driver = redirect
+  domains = rt.debian.org
+  require_files = /usr/bin/rt-mailgate : RT_QUEUE_MAP
+  local_parts = ${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}}
+  local_part_suffix = +new
+  pipe_transport = rt_pipe
+  data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --action ${if match{$local_part}{.*-comment.*}{comment}{correspond}}"
+  headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
+
+rt-otherwise:
   debug_print = "R: rt for $local_part@$domain"
   driver = redirect
   domains = rt.debian.org