X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=a1dfb504db720daa7c8d699ac00a680486fba8d6;hb=d117827ccb06fdfe2a81b14226d96446871a855e;hp=4f241704c7ffc0ec56332d8e72ff9a88367c5ed4;hpb=52bc31ae7f6e7156f5931a197b05f3014ba01155;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 4f241704c..a1dfb504d 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,27 +5,30 @@
 ## Format:
 ## domain: hostname[::port] options
 ## example:
-## buildd.debian.org: raff.debian.org::587 byname
+## buildd.debian.org: foobar.debian.org::587 byname
 
 <%=
-mxmatches = [ fqdn ]
+mxmatches = [ @fqdn ]
 routes = []
 extraroutes = []
 
-case fqdn
-when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then
+if scope.function_has_role(['mailrelay'])
   mxmatches << 'mailout.debian.org'
-  extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  mxmatches << 'INCOMING-MX'
+  extraroutes = [ ]
+  extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
+  extraroutes << "tracker.debian.org:\t\tticharich.debian.org"
 end
 
-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