More ekeyd work

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 769ffcddf18e395bfad22adf5ab41d4ad407404a..ce473bfb89ce27d3ff4de83c4ef02baa5ac571ba 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,10 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
+    case $hostname {
+        heininen,unger: { include entropykey }
+    }
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
@@ -98,24 +102,13 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        liszt,widor:                     { include named::recursor }
+        liszt:                           { include named::recursor }
     }
     case $hostname {
-        franck,master,murphy,ries,samosa,spohr:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            #case getfromhash($nodeinfo, 'squeeze') {
-            #    true:  {
-            #        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