X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6b6b43e2b677e2e81d8d09333daec8a384dde316;hb=fdd1e9d8391884cbfeff9492b74960eea5e3564d;hp=9bab5c60335546f7c243de8cf257820ea85cf83e;hpb=5abb3930401e68a2f7b768b9bf1949b74a0eab8b;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9bab5c603..6b6b43e2b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -96,26 +96,15 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
-        geo1,geo2,geo3:                  { include named::geodns }
-        liszt,widor:                     { include named::recursor }
+        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        geo1,geo2,geo3:                          { include named::geodns }
+        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
 
@@ -130,7 +119,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr,stabile: {
+        beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -162,7 +151,12 @@ node default {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: