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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9bab5c603..398da0ab9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,15 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
+    case $hostname {
+        heininen:    {
+            include "entropykey::provider"
+        }
+        unger:    {
+            include "entropykey::remote_consumer"
+        }
+    }
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
@@ -98,24 +107,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