Move hosterinfo into nodeinfo

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

diff --git a/manifests/site.pp b/manifests/site.pp
index b813499098614edc2a181c80a4bad8aea32d7339..f0699a9e4cb627061715ad76b7c95ce1376b241c 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +16,7 @@ Exec {
 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")
-    notice("hoster for ${fqdn} is ${hosterinfo}")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
 
     include munin-node
     include syslog-ng
@@ -103,8 +100,15 @@ node default {
         franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
     }
     case $hostname {
-        ries:   { include unbound }
+        ries:   {
+            include unbound
+            $runs_local_resolver = true
+        }
+        default: {
+            $runs_local_resolver = false
+        }
     }
+    include resolv
 
     case $kernel {
         Linux: {
@@ -125,10 +129,6 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, 'nameservers') {
-        false:      {}
-        default:    { include resolv }
-    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }