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

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 2fbac0254..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
@@ -1018,8 +1019,7 @@ rt_force_new_quiesce:
   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}"
+  headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nX-RT-Mode: quiesce"
 
 rt_otherwise:
   debug_print = "R: rt for $local_part@$domain"