X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ffiles%2Fcommon%2Fexim4.conf;h=696901d17b133cd6ce304d9046c77c734d2eedd9;hb=6dc7dc1b64528cd93a0242bedf87b7f6432a09c7;hp=90d29ed03ef6e63208ef9b0d74e3be58d4b56d68;hpb=bbd65692ac82ca6ee5dfc5a32a66eec3a83bef44;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 90d29ed03..696901d17 100644
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -199,10 +199,11 @@ av_scanner = CLAMAV
 
 .ifdef HAVE_USER_DEBBUGS MAIL_RELAY STUPID_FIREWALL
 daemon_smtp_ports = 25 : 587
-.endif
+.else
 .ifdef EVEN_MORE_STUPID_FIREWALL
 daemon_smtp_ports = 25 : 2025
 .endif
+.endif
 
 admin_groups = adm
 remote_sort_domains = *.debian.org:*.debian.net
@@ -993,7 +994,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,7 +1005,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}"
 
-rt-otherwise:
+# 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 = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nX-RT-Mode: quiesce"
+
+rt_otherwise:
   debug_print = "R: rt for $local_part@$domain"
   driver = redirect
   domains = rt.debian.org