and merge mxinfo into allnodeinfo

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 35afbb5bf4a14b2d7fcf0bc99fbdca3947643a79..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")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
-    $mxinfo    = allnodeinfo("mXRecord")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose", "mXRecord")
     notice("hoster for ${fqdn} is ${hosterinfo}")
 
     include munin-node
@@ -102,6 +101,19 @@ node default {
         geo1,geo2,geo3:                  { include named::geodns }
         franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
     }
+    case $hostname {
+        ries:   {
+            include unbound
+            $runs_local_resolver = true
+        }
+        default: {
+            $runs_local_resolver = false
+        }
+    }
+    case getfromhash($hosterinfo, 'nameservers') {
+        false:      {}
+        default:    { include resolv }
+    }
 
     case $kernel {
         Linux: {
@@ -122,10 +134,6 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, 'nameservers') {
-        false:      {}
-        default:    { include resolv }
-    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }