We use "keyinfo" in all kinda of places. Rename it to something more generic

[mirror/dsa-puppet.git] / modules / exim / templates / manualroute.erb

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 457d4da..07ddf55 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -9,16 +9,18 @@
 
 <%=
 mxmatches = [ fqdn ]
+routes = []
+extraroutes = []
+
 case fqdn
-when 'spohr.debian.org', 'draghi.debian.org' then 
+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|
+ldapall.keys.sort.each do |host|
+  ldapall[host]['mXRecord'].each do |mx|
     mxmatch = mxregex.match(mx)
     if mxmatches.include?(mxmatch[1])
       route = host + ":\t\t" + host
@@ -30,5 +32,7 @@ mxinfo.keys.sort.each do |host|
   end
 end
 
+routes << extraroutes
+
 routes.join("\n")
 %>