X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=8a070333bf6aace5ad8d049a4946d8257eb9176c;hb=404edcd3bddf15af30b55ff0d76eb2e2d9f5a970;hp=7b6813f2482c2e9b075197ced7750a3f199b2dcd;hpb=4f238d34eb3ebf2109afe1eeaa387024f603ff91;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 7b6813f24..8a070333b 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,27 +5,31 @@
 ## Format:
 ## domain: hostname[::port] options
 ## example:
-## buildd.debian.org: grieg.debian.org::587 byname
+## buildd.debian.org: foobar.debian.org::587 byname
 
 <%=
-mxmatches = [ fqdn ]
+mxmatches = [ @fqdn ]
 routes = []
 extraroutes = []
 
-if scope.lookupvar('site::nodeinfo')['mailrelay']
+if @is_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"
+  extraroutes << "salsa.debian.org:\t\tgodard.debian.org"
 end
 
-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|
+mxregex = Regexp.new('^\d+\s+(.*?)\.?$')
+scope.lookupvar('deprecated::allnodeinfo').keys.sort.each do |host|
+  next unless scope.lookupvar('deprecated::allnodeinfo')[host]['mXRecord']
+  scope.lookupvar('deprecated::allnodeinfo')[host]['mXRecord'].each do |mx|
     mxmatch = mxregex.match(mx)
     if mxmatches.include?(mxmatch[1])
       route = host + ":\t\t" + host
-      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
+      if scope.lookupvar('deprecated::localinfo').has_key?(host) and scope.lookupvar('deprecated::localinfo')[host].has_key?('mail_port') and scope.lookupvar('deprecated::localinfo')[host]['mail_port'].to_s != ''
+        route += "::" + scope.lookupvar('deprecated::localinfo')[host]['mail_port'].to_s
       end
       routes << route
     end