Merge branch 'ferm'

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 092f3212448d2953d8fbc53c4824cb31b6bb7df9..b10857915f571391132bd8e4b80fc6636d571344 100644 (file)
--- 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
@@ -81,6 +82,9 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt", "ftcollins":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    }
+    case $hostname {
+       brahms: { include ferm }
     }
 }