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

diff --git a/manifests/site.pp b/manifests/site.pp
index ca634b754..d043a502c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -98,10 +98,10 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,spohr,widor:   { include named::recursor }
+        liszt,widor:                     { include named::recursor }
     }
     case $hostname {
-        ries,samosa:   {
+        franck,master,murphy,ries,samosa,spohr:   {
             include unbound
             $runs_local_resolver = true
         }
@@ -109,6 +109,9 @@ node default {
             $runs_local_resolver = false
         }
     }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
+    }
     include resolv
 
     case $kernel {