X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=1c719fe7ff82f387ecaae4d7f868aeeefdd4127d;hb=78ceca7ca6540a83d24a89016263235c923543db;hp=4525e5063447298d91d64402b288cbe2e5c6d2df;hpb=b507681f854f09cfc91da7b0b3a625c9d3c30022;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 4525e5063..1c719fe7f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,6 +50,11 @@ node default {
 
     case $hostname {
         spohr: {
+                      include munin-node::master
+        }
+    }
+    case $hostname {
+        tchaikovsky: {
                       include nagios::server
         }
         default: {
@@ -71,9 +76,12 @@ node default {
     }
 
     case $hostname {
-        rietz,klecker,ravel,senfl: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }
@@ -83,7 +91,4 @@ node default {
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
-    case $hostname {
-	brahms: { include ferm }
-    }
 }