routes = []
extraroutes = []
-if scope.function_has_role(['mailrelay'])
+if @is_mailrelay
mxmatches << 'mailout.debian.org'
mxmatches << 'INCOMING-MX'
extraroutes = [ ]
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|
+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