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

diff --git a/manifests/site.pp b/manifests/site.pp
index 7de155a92..398da0ab9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +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")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
-    $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${getfromhash(hosterinfo, 'name')}")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -37,13 +35,22 @@ 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 }
     }
     case $kvmdomain {
         "true": {
             package { acpid: ensure => installed }
-            case extractnodeinfo($nodeinfo, 'squeeze') {
+            case getfromhash($nodeinfo, 'squeeze') {
                 true:  { package { acpi-support-base: ensure => installed } }
             }
         }
@@ -54,32 +61,32 @@ node default {
 
     case $mta {
         "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+             case getfromhash($nodeinfo, 'heavy_exim') {
                   true:  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
-    case extractnodeinfo($nodeinfo, 'puppetmaster') {
+    case getfromhash($nodeinfo, 'puppetmaster') {
         true: { include puppetmaster }
     }
 
-    case extractnodeinfo($nodeinfo, 'muninmaster') {
+    case getfromhash($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
 
-    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+    case getfromhash($nodeinfo, 'nagiosmaster') {
         true:    { include nagios::server }
         default: { include nagios::client }
     }
 
     case $apache2 {
          "true":  {
-              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+              case getfromhash($nodeinfo, 'apache2_security_mirror') {
                      true:    { include apache2::security_mirror }
               }
-              case extractnodeinfo($nodeinfo, 'apache2_www_mirror') {
+              case getfromhash($nodeinfo, 'apache2_www_mirror') {
                      true:    { include apache2::www_mirror }
               }
               include apache2
@@ -91,7 +98,7 @@ node default {
     }
 
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
+    case getfromhash($nodeinfo, 'buildd') {
          true:  {
              include buildd
          }
@@ -100,8 +107,15 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,schein,spohr,steffani,widor:   { include named::recursor }
+        liszt:                           { include named::recursor }
     }
+    case $hostname {
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
+    }
+    include resolv
 
     case $kernel {
         Linux: {
@@ -122,9 +136,6 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, "name") {
-        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
-    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }