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

diff --git a/manifests/site.pp b/manifests/site.pp
index b10857915..9fa43dd06 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,9 +50,13 @@ node default {
 
     case $hostname {
         spohr: {
-                      include nagios::server
                       include munin-node::master
         }
+    }
+    case $hostname {
+        tchaikovsky: {
+                      include nagios::server
+        }
         default: {
 		      include nagios::client
 	}
@@ -72,7 +76,7 @@ node default {
     }
 
     case $hostname {
-        rietz,klecker,ravel,senfl: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
     case $hostname {
@@ -84,7 +88,4 @@ node default {
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
-    case $hostname {
-	brahms: { include ferm }
-    }
 }