X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=60531f940e0c2c98cf1069dac4912877bb3f85ac;hb=768fe74bfbca0fd0c55dc34bff0ff31ce057ce00;hp=33b114927f6029b589b08a7e50d6974be99880e9;hpb=47968951268439eb72ff714afdb51385e900b4cd;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 33b114927..60531f940 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,7 +76,7 @@ node default {
     }
 
     case $hostname {
-        rietz,raff,klecker: { include named::secondary }
+        rietz,klecker,ravel,senfl,orff: { include named::secondary }
     }
 
     case $hostname {
@@ -81,6 +86,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }