X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=04c7f9c78d7400b682be0fdb61de0d0c12af2ff5;hb=c4051ff2b0046e958340c05dbc04a2a35f1712ba;hp=c31385cf9b4af048cdf48a0740bc775bc98c9789;hpb=8e07fe0746eede00b88441660d30af08d621e623;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c31385cf9..04c7f9c78 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 }
-        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,murphy,ries,samosa,smetana,spohr:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
     include resolv