X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=e5f1e12aa616f567822f5682359aeb4bbf9f894f;hb=8aaa2ec3df6206ed9c27c3a7f308ec212a0dd037;hp=345b7cb13103e79789aaef93da73f33159c14ed5;hpb=4106f6e14450562b6b4165eeb5a40cb204e39bcd;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 345b7cb1..e5f1e12a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,10 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
+    case $hostname {
+        heininen,unger,rautavaara,englund,salieri: { include entropykey }
+    }
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
@@ -98,16 +102,13 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        liszt,spohr,widor:               { include named::recursor }
+        liszt:                           { include named::recursor }
     }
     case $hostname {
-        franck,master,ries,samosa:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            $runs_local_resolver = false
-        }
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
     include resolv