X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=97df07e7c3695914d83ff1a9c7108ba088c19e69;hb=710901c5637ad206f4ef4bfec4df8e3d3dfa667d;hp=9a09d547f8d5a5282980a319ad4a5e5da4681d55;hpb=3b3fea726ba4fbc9aa9cecad6b1eb6bf3232406d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9a09d547f..97df07e7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +16,10 @@ Exec {
 node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${hoster}")
+    notice("hoster for ${fqdn} is ${hosterinfo}")
 
     include munin-node
     include syslog-ng
@@ -43,7 +43,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 +54,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 +91,7 @@ node default {
     }
 
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
+    case getfromhash($nodeinfo, 'buildd') {
          true:  {
              include buildd
          }
@@ -122,7 +122,7 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case $hoster {
+    case getfromhash($hosterinfo, 'name') {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
     case $portforwarder_user_exists {
@@ -147,7 +147,7 @@ node default {
 
     case $hostname {
         chopin,geo3,soler,wieck: {
-            include sysctl
+            include debian-radvd
         }
    }
 }