X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d6ec89f64b6087c2a07bc31f57d50b07764336fb;hb=571572f372320efab5230dc52f7591ba0d2831ef;hp=13d7f4618360e28b5c2070677ec8a6a7f397bfcb;hpb=d786f4ec40f28a617b962f753c1350e924f91f52;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 13d7f4618..d6ec89f64 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,10 +14,14 @@ Exec {
 }
 
 node default {
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hoster   = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $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")
     notice("hoster for ${fqdn} is ${hoster}")
 
+    $mxinfo   = allnodeinfo("mXRecord")
+
     include munin-node
     include sudo
     include ssh
@@ -31,7 +35,9 @@ node default {
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
+    }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
     }
 
     case $mta {
@@ -41,12 +47,16 @@ node default {
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        "true": {
+                      include munin-node::master
+        }
+    }
 
-    case $hostname {
-        spohr: {
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        "true": {
                       include nagios::server
         }
         default: {
@@ -54,38 +64,36 @@ node default {
 	}
     }
 
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-           default: { }
-     }
-
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-           default: { }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-           default: { }
-     }
+    case $apache2 {
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     "true":  { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
+    }
 
+    case extractnodeinfo($nodeinfo, 'buildd') {
+         "true":  { include buildd }
+    }
 
-# maybe wait for rietz to be upgraded to lenny
     case $hostname {
-        rietz,raff,klecker:
-                   { include named::secondary }
-        default:   {}
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
-     case $hostname {
-         geo1,geo2,geo3:
-                    {
-                      include named::geodns
-                    }
-         default:   {
-                    }
-     }
-     case $brokenhosts {
-         "true":    { include hosts }
-         default:   {}
-     }
+    case $hostname {
+        logtest01: { include ferm }
+    }
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }