From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Mon, 23 Sep 2019 20:20:00 +0000 (+0100)
Subject: eximconf.erb: simplify bugs.d.o router
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=8291bcf921d1a52ff09c1549ccd6b596e9f44b79

eximconf.erb: simplify bugs.d.o router

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 6ce79a48d..e2f02d675 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1455,17 +1455,13 @@ virt_users:
   local_part_suffix_optional
   retry_use_local_part
 
-<%=
-out = ""
-if @is_bugsmx
-  domain = 'bugs.debian.org'
-  out = '
+<%- if @is_bugsmx -%>
 # This router delivers for bugs.d.o
 bugs:
   debug_print = "R: bugs for $local_part@$domain"
   driver = accept
   transport = bugs_pipe
-  domains = ' + domain + '
+  domains = bugs.debian.org
   cannot_route_message = Unknown or archived bug
   require_files = /srv/bugs.debian.org/mail/run-procmail
   no_more
@@ -1474,10 +1470,7 @@ bugs:
                   {\N^(\d+)(\d{2})(?:-(?:(?:submit|maintonly|quiet|forwarded|done|close|request|submitter)|(?:unsubscribe|ignore|help|(?:sub(?:scribe|help|yes|approve|reject))|unsubyes|bounce|probe|approve|reject|setlistyes|setlistsilentyes).*))?$\N}\
                {${if exists{/srv/bugs.debian.org/spool/db-h/$2/$1$2.summary}\
 	       {$local_part}fail}}fail}
-'
-end
-out
-%>
+<%- end -%>
 ######################################################################
 #                      TRANSPORTS CONFIGURATION                      #
 ######################################################################