merikanto and murphy are on squeeze now anyway, no need to include the unbound class...

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index c31385cf9b4af048cdf48a0740bc775bc98c9789..2055338533a5f67d1072416e5dfff5ae05ffd147 100644 (file)
--- 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,lobos,ries,samosa,smetana,spohr:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
     include resolv