X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=08e5fec3dedfb082f6e88ddb86e0007dc95ea067;hb=00f10ba994dcc5c06b1d0e437cbdbfcabb3e974f;hp=376bb399a237d2494c187d4b1a560770741ac24a;hpb=803e5996e2585802126d685475907c8f4231ee43;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 376bb399a..08e5fec3d 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 ${getfromhash(hosterinfo, 'name')}")
 
     include munin-node
     include syslog-ng
@@ -43,8 +43,8 @@ node default {
     case $kvmdomain {
         "true": {
             package { acpid: ensure => installed }
-            case extractnodeinfo($nodeinfo, 'squeeze') {
-                'true':  { package { acpi-support-base: ensure => installed } }
+            case getfromhash($nodeinfo, 'squeeze') {
+                true:  { package { acpi-support-base: ensure => installed } }
             }
         }
     }
@@ -54,29 +54,33 @@ node default {
 
     case $mta {
         "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  'true':  { include exim::mx }
+             case getfromhash($nodeinfo, 'heavy_exim') {
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
-    case extractnodeinfo($nodeinfo, 'muninmaster') {
-        "true": { include munin-node::master }
+    case getfromhash($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
     }
 
-    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
-        "true":    { include nagios::server }
+    case getfromhash($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
+    }
+
+    case getfromhash($nodeinfo, 'nagiosmaster') {
+        true:    { include nagios::server }
         default: { include nagios::client }
     }
 
     case $apache2 {
          "true":  {
-              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-                     "true":    { include apache2::security_mirror }
+              case getfromhash($nodeinfo, 'apache2_security_mirror') {
+                     true:    { include apache2::security_mirror }
               }
-              case extractnodeinfo($nodeinfo, 'apache2_www_mirror') {
-                     "true":    { include apache2::www_mirror }
+              case getfromhash($nodeinfo, 'apache2_www_mirror') {
+                     true:    { include apache2::www_mirror }
               }
               include apache2
          }
@@ -87,8 +91,8 @@ node default {
     }
 
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
-         'true':  {
+    case getfromhash($nodeinfo, 'buildd') {
+         true:  {
              include buildd
          }
     }
@@ -118,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 {
@@ -131,7 +135,7 @@ node default {
         byrd,schuetz,tchaikovsky: {
             include krb
         }
-        draghi,quantz,samosa: {
+        draghi,quantz: {
             include krb
             include afs
         }
@@ -140,6 +144,12 @@ node default {
             include afs::server
         }
     }
+
+    case $hostname {
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
+        }
+   }
 }
 
 # vim:set et: