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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4d0ef65aa..398da0ab9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,9 +16,8 @@ Exec {
 node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
     $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
-    notice("hoster for ${fqdn} is ${hosterinfo}")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -36,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 }
     }
@@ -99,16 +107,13 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+        liszt:                           { include named::recursor }
     }
     case $hostname {
-        ries:   {
-            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