X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=ce22a342b867ca9adfa9a4e5021a94d3111889da;hb=5430090f26c627828a0e8e267be34ff687e76920;hp=6170a614bba21d0656244128485d5d2c4203cad8;hpb=0b413749a22fe5696bd93759ffd29c95ad09d9f2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 6170a614b..ce22a342b 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -8,47 +8,30 @@
 ## buildd.debian.org: raff.debian.org::587 byname
 
 <%=
-routes = case fqdn
-        when 'spohr.debian.org', 'draghi.debian.org' then '
-agnesi.debian.org:		agnesi.debian.org::25
-agricola.debian.org:		agricola.debian.org::25
-albeniz.debian.org:		albeniz.debian.org::25
-ancina.debian.org:              ancina.debian.org::2025
-arcadelt.debian.org:            arcadelt.debian.org::25
-argento.debian.org:             argento.debian.org::25
-brahms.debian.org:              brahms.debian.org::25
-crest.debian.org:		crest.debian.org::25
-goedel.debian.org:              goedel.debian.org::25
-goetz.debian.org:               goetz.debian.org::25
-kassia.debian.org:              kassia.debian.org::587
-lafayette.debian.org:           lafayette.debian.org::25
-lebrun.debian.org:              lebrun.debian.org::25
-leisner.debian.org:		leisner.debian.org::25
-mahler.debian.org:		mahler.debian.org::25
-malo.debian.org:                malo.debian.org::25
-mayer.debian.org:               mayer.debian.org::25
-merulo.debian.org:		merulo.debian.org::25
-morales.debian.org:		morales.debian.org::25
-murphy.debian.org:              murphy.debian.org::25
-paer.debian.org:                paer.debian.org::25
-penalosa.debian.org:            penalosa.debian.org::25
-pergolesi.debian.org:		pergolesi.debian.org::25
-pescetti.debian.org:		pescetti.debian.org::25
-piatti.debian.org:              piatti.debian.org::2025
-praetorius.debian.org:          praetorius.debian.org::25
-puccini.debian.org:             puccini.debian.org::25
-rem.debian.org:                 rem.debian.org::25
-schroeder.debian.org:           schroeder.debian.org::25
-smetana.debian.org:		smetana.debian.org::25
-sperger.debian.org:		sperger.debian.org::25
-spontini.debian.org:            spontini.debian.org::25
-zee.debian.org:			zee.debian.org::25
-zelenka.debian.org:		zelenka.debian.org::25
-'
-        when 'luchesi.debian.org' then '
-finzi.debian.org:          [172.17.12.2]::25
-fano.debian.org:           [172.17.12.3]::25
-'
+mxmatches = [ fqdn ]
+routes = []
+extraroutes = []
+
+if nodeinfo['mailrelay']
+  mxmatches << 'mailout.debian.org'
+  extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+end
+
+mxregex = Regexp.new('^\d+\s+(.*)\.$')
+mxinfo.keys.sort.each do |host|
+  mxinfo[host]['mXRecord'].each do |mx|
+    mxmatch = mxregex.match(mx)
+    if mxmatches.include?(mxmatch[1])
+      route = host + ":\t\t" + host
+      if localinfo.has_key?(host) and localinfo[host].has_key?('mail_port') and localinfo[host]['mail_port'].to_s != ''
+        route += "::" + localinfo[host]['mail_port'].to_s
+      end
+      routes << route
+    end
+  end
 end
-routes
+
+routes << extraroutes
+
+routes.join("\n")
 %>