From: Luca Filipozzi <lucaf@goofy.ece.ubc.ca>
Date: Thu, 23 Apr 2009 15:32:19 +0000 (-0700)
Subject: rename git_force_new to git_force_new_verbose; add rt_force_new_quiesce
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=1b5981aee978aaf252dca412ac8c203d3cfcb863;p=dsa-puppet.git

rename git_force_new to git_force_new_verbose; add rt_force_new_quiesce
---

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 1bcb0f24..2fbac025 100644
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -993,7 +993,7 @@ bugs:
 .endif
 
 # This router delivers for rt.d.o
-rt_force_new:
+rt_force_new_verbose:
   debug_print = "R: rt for $local_part+new@$domain"
   driver = redirect
   domains = rt.debian.org
@@ -1004,6 +1004,23 @@ rt_force_new:
   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}"
 
+# FIXME: figure out how to generalize this approach so that all of the following would work
+# - rt+NNNN@rt.debian.org          : attach correspondence to ticket (verbose)
+# - rt+NNNN-quiesce@rt.debian.org  : attach correspondence to ticket (quiesce)
+# - rt+NNNN-<action>@rt.debian.org : attach correspondence to ticket (some action)
+# requires modification to custom condition in 'scrips'
+rt_force_new_quiesce:
+  debug_print = "R: rt for $local_part+new-quiesce@$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-quiesce
+  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 = "X-RT-Mode: quiesce"
+  headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
+
 rt_otherwise:
   debug_print = "R: rt for $local_part@$domain"
   driver = redirect