X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=aa4f69c8bf496ad2a019f1d5e6a3fcd459e1ce98;hb=9dcfb48e8927ce1720573c569280fe1743eefc80;hp=54711fe03f9453913eb55ead12cf8fcd892fbc1d;hpb=d90e56e8dce02e7dddf90367de47a1e6e78d8e0e;p=mirror%2Fdsa-puppet.git

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