X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=144a401c9f6bda3b60bd80cb371bd677844e6606;hb=65a9612fcfd5ee6b1ae9342da041d286407d4c1e;hp=aff54f9e44bbc64e683f10a6bf2b62842660083c;hpb=e7f2528c7a168e3e5c20baab6479074d69a0cd67;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index aff54f9e4..144a401c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +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")
     $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
-    notice( sprintf("hoster for %s is %s", $fqdn, $nodeinfo) )
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -98,16 +98,13 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+        liszt,widor:                     { include named::recursor }
     }
     case $hostname {
-        ries:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            $runs_local_resolver = false
-        }
+        franck,master,merikanto,lobos,murphy,ries,samosa,smetana,spohr:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
     include resolv