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

diff --git a/manifests/site.pp b/manifests/site.pp
index 5ffb7a958..aa4f69c8b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,6 +51,7 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
+                      include munin-node::master
         }
         default: {
 		      include nagios::client
@@ -70,9 +71,8 @@ node default {
          "true":  { include buildd }
     }
 
-# maybe wait for rietz to be upgraded to lenny
     case $hostname {
-        rietz,raff,klecker: { include named::secondary }
+        rietz,klecker,ravel,senfl,orff: { include named::secondary }
     }
 
     case $hostname {
@@ -82,6 +82,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }