X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=40062d8dccd1e7f218624c83c22df2552a870f57;hb=47956d833f29daab3137c1e71cbf0926bd7db5f4;hp=ce22a342b867ca9adfa9a4e5021a94d3111889da;hpb=7af993b35bdb4a219b4f631d1f64ab1811923597;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb index ce22a342b..40062d8dc 100644 --- a/modules/exim/templates/manualroute.erb +++ b/modules/exim/templates/manualroute.erb @@ -18,8 +18,9 @@ if nodeinfo['mailrelay'] end mxregex = Regexp.new('^\d+\s+(.*)\.$') -mxinfo.keys.sort.each do |host| - mxinfo[host]['mXRecord'].each do |mx| +allnodeinfo.keys.sort.each do |host| + next unless allnodeinfo[host]['mXRecord'] + allnodeinfo[host]['mXRecord'].each do |mx| mxmatch = mxregex.match(mx) if mxmatches.include?(mxmatch[1]) route = host + ":\t\t" + host