X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9fa43dd063859975f76b6358cefa1dcd2641e7a8;hb=9238b1df481938b60dba7955887ed505d2b00ce3;hp=89096a0a92b04df1eacb731a23ff32341171afd5;hpb=0b027a7c9c8e8dea6263757b56d7f9c5f4076d19;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 89096a0a9..9fa43dd06 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,9 @@ node default {
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
+    }
 
     case $mta {
         "exim4":   {
@@ -47,6 +50,11 @@ node default {
 
     case $hostname {
         spohr: {
+                      include munin-node::master
+        }
+    }
+    case $hostname {
+        tchaikovsky: {
                       include nagios::server
         }
         default: {
@@ -68,7 +76,7 @@ node default {
     }
 
     case $hostname {
-        rietz,raff,klecker: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
     case $hostname {
@@ -78,6 +86,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }