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

diff --git a/manifests/site.pp b/manifests/site.pp
index e0f2ef450..9bab5c603 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
@@ -43,7 +41,7 @@ node default {
     case $kvmdomain {
         "true": {
             package { acpid: ensure => installed }
-            case extractnodeinfo($nodeinfo, 'squeeze') {
+            case getfromhash($nodeinfo, 'squeeze') {
                 true:  { package { acpi-support-base: ensure => installed } }
             }
         }
@@ -54,32 +52,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 +89,7 @@ node default {
     }
 
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
+    case getfromhash($nodeinfo, 'buildd') {
          true:  {
              include buildd
          }
@@ -100,8 +98,26 @@ 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,widor:                     { 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
+                }
+            }
+        }
+    }
+    include resolv
 
     case $kernel {
         Linux: {
@@ -122,9 +138,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 }
     }