X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d043a502ce392e8da264c1fc03782a2a088d9799;hb=c55565a26509cfcbb0ff972dd67bffe6cc352482;hp=cef0b874c63d4f24d4efddecaffc51551b9fa65e;hpb=e85c72adcbee777243a5bebc2d7591ed105dd7fb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index cef0b874c..d043a502c 100644
--- 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")
     $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
-    $tmp = getfromhash($nodeinfo, 'hoster', 'name')
-    notice( sprintf("hoster for %s is %s", $fqdn, $tmp )
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -99,10 +98,10 @@ 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:   {
+        franck,master,murphy,ries,samosa,spohr:   {
             include unbound
             $runs_local_resolver = true
         }
@@ -110,6 +109,9 @@ node default {
             $runs_local_resolver = false
         }
     }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
+    }
     include resolv
 
     case $kernel {