X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=3522f84d06b4a51cdebbfd59e6e9f1d735b22b69;hb=f7396dcf7cf934477bd85843c7ec9dc15cdd7012;hp=457d4da241405b7ff998432fbdf16220d459ed77;hpb=4f10084376e1862f3bda1b332c986642e758cda7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 457d4da24..3522f84d0 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,30 +5,36 @@
 ## Format:
 ## domain: hostname[::port] options
 ## example:
-## buildd.debian.org: raff.debian.org::587 byname
+## buildd.debian.org: foobar.debian.org::587 byname
 
 <%=
-mxmatches = [ fqdn ]
-case fqdn
-when 'spohr.debian.org', 'draghi.debian.org' then 
+mxmatches = [ @fqdn ]
+routes = []
+extraroutes = []
+
+if scope.function_has_role(['mailrelay'])
   mxmatches << 'mailout.debian.org'
+  mxmatches << 'INCOMING-MX'
+  extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
 end
 
-routes = []
-
-mxregex = Regexp.new('^\d+\s+(.*)\.$')
-mxinfo.keys.sort.each do |host|
-  mxinfo[host][0]['mXRecord'].each do |mx|
+mxregex = Regexp.new('^\d+\s+(.*?)\.?$')
+scope.lookupvar('site::allnodeinfo').keys.sort.each do |host|
+  next unless scope.lookupvar('site::allnodeinfo')[host]['mXRecord']
+  scope.lookupvar('site::allnodeinfo')[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
+      if scope.lookupvar('site::localinfo').has_key?(host) and scope.lookupvar('site::localinfo')[host].has_key?('mail_port') and scope.lookupvar('site::localinfo')[host]['mail_port'].to_s != ''
+        route += "::" + scope.lookupvar('site::localinfo')[host]['mail_port'].to_s
       end
       routes << route
     end
   end
 end
 
+routes << extraroutes
+
 routes.join("\n")
 %>