X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d6ec89f64b6087c2a07bc31f57d50b07764336fb;hb=4470a04f2686b69c3d10776c24ef2ff56f83982d;hp=7f9e3119dc6c8d020c1f0cff6b6e8287683bf7e4;hpb=7674d9618f50acf645d96fe3a4122e180bc32d2a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 7f9e3119d..d6ec89f64 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,10 +14,13 @@ 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   = allnodinfo("mXRecord")
+
+    $mxinfo   = allnodeinfo("mXRecord")
 
     include munin-node
     include sudo
@@ -33,6 +36,9 @@ node default {
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
+    }
 
     case $mta {
         "exim4":   {
@@ -43,8 +49,14 @@ node default {
         }
     }
 
-    case $hostname {
-        spohr: {
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        "true": {
+                      include munin-node::master
+        }
+    }
+
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        "true": {
                       include nagios::server
         }
         default: {
@@ -52,23 +64,26 @@ node default {
 	}
     }
 
-    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-         "true":  { include apache2 }
+    case $apache2 {
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     "true":  { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
          "true":  { include buildd }
     }
-    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-         "true":  { include apache2::security_mirror }
-    }
-
 
-# maybe wait for rietz to be upgraded to lenny
     case $hostname {
-        rietz,raff,klecker: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }
@@ -76,6 +91,9 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
     }
 }