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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2bc7939d8..1c719fe7f 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,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 }
     }