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

diff --git a/manifests/site.pp b/manifests/site.pp
index 998a85312..144a401c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -98,16 +98,13 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        liszt,master,spohr,widor:        { include named::recursor }
+        liszt,widor:                     { include named::recursor }
     }
     case $hostname {
-        franck,ries,samosa:   {
-            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