X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9fa43dd063859975f76b6358cefa1dcd2641e7a8;hb=85fb85cdc8c20b0285b44dc23cef761377a4fb21;hp=5ffb7a95806ad6309bd071b21f5dc9cdec04dd17;hpb=a3afca653f670c4037f487e7ddc870fc6877545b;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 5ffb7a958..9fa43dd06 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: {
@@ -70,9 +75,8 @@ node default {
          "true":  { include buildd }
     }
 
-# maybe wait for rietz to be upgraded to lenny
     case $hostname {
-        rietz,raff,klecker: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
     case $hostname {
@@ -82,6 +86,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }