and merge mxinfo into allnodeinfo

diff --git a/manifests/site.pp b/manifests/site.pp
index 5dfeef0a8e1d2be950b2009ed16b044d5141780f..394cf8fa706f06e5dac0deda2c31f8fdf6e32713 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,8 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $allnodeinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
-    $mxinfo    = allnodeinfo("mXRecord")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose", "mXRecord")
     notice("hoster for ${fqdn} is ${hosterinfo}")
 
     include munin-node

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index ce22a342b867ca9adfa9a4e5021a94d3111889da..40062d8dccd1e7f218624c83c22df2552a870f57 100644 (file)
--- 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