X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8a5c9711ed52d6b27548c77c023d419d248db8c3;hb=103c20fec9e53838c741754d4b80ddb24345e9d4;hp=345b7cb13103e79789aaef93da73f33159c14ed5;hpb=4106f6e14450562b6b4165eeb5a40cb204e39bcd;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 345b7cb13..8a5c9711e 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 }
-        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
 
@@ -154,7 +151,12 @@ node default {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: