X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2bc7939d85725c303ed55b4b841fc6630b9999cb;hb=77043b45d263146c8b95bdd5f28fe4c87eaeb349;hp=59bce1cdfc4dd9d5409aa6cd70de65af6ae58d32;hpb=63943795975dc01dffc4ebce9306d836fe6342a2;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 59bce1cdf..2bc7939d8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,11 +14,11 @@ 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")
     notice("hoster for ${fqdn} is ${hoster}")
 
-    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $mxinfo   = allnodeinfo("mXRecord")
 
     include munin-node
@@ -35,6 +35,9 @@ node default {
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
+    }
 
     case $mta {
         "exim4":   {
@@ -48,27 +51,28 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
+                      include munin-node::master
         }
         default: {
 		      include nagios::client
 	}
     }
 
-    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 }
+        rietz,klecker,ravel,senfl: { include named::secondary }
     }
 
     case $hostname {
@@ -78,6 +82,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }