this should virtually work

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 5ffb7a9..1c719fe 100644 (file)
--- 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,11 +75,13 @@ 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 {
+        logtest01: { include ferm }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }
@@ -82,6 +89,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }