## Format:
## domain: hostname[::port] options
## example:
-## buildd.debian.org: grieg.debian.org::587 byname
+## buildd.debian.org: foobar.debian.org::587 byname
<%=
-mxmatches = [ scope.lookupvar('::fqdn') ]
+mxmatches = [ @fqdn ]
routes = []
extraroutes = []
-if scope.lookupvar('site::nodeinfo')['mailrelay']
+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+(.*)\.$')
+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|