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

diff --git a/manifests/site.pp b/manifests/site.pp
index abceb1fb7..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,raff,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 }
     }
@@ -81,6 +89,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }