From: Stephen Gran <steve@lobefin.net>
Date: Tue, 6 Apr 2010 20:23:34 +0000 (+0100)
Subject: add manualroute for keyring
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af13aa4419aeb80dc5ba835669c970df5bb4223c;p=dsa-puppet.git

add manualroute for keyring

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index c798cc91..9f78c16c 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -9,13 +9,15 @@
 
 <%=
 mxmatches = [ fqdn ]
+routes = []
+extraroutes = []
+
 case fqdn
 when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then
   mxmatches << 'mailout.debian.org'
+  extraroutes = [ 'keyring.debian.org:\t\tkaufmann.debian.org' ]
 end
 
-routes = []
-
 mxregex = Regexp.new('^\d+\s+(.*)\.$')
 mxinfo.keys.sort.each do |host|
   mxinfo[host][0]['mXRecord'].each do |mx|
@@ -30,5 +32,7 @@ mxinfo.keys.sort.each do |host|
   end
 end
 
+routes << extraroutes
+
 routes.join("\n")
 %>