Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 05964ac245d7943650cf1cd303af0b0b732050e0..99af3fce6c6ce11e270e5d37180cbf067478c30b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -12,6 +12,7 @@ File {
 node default {
     include munin-node
     include samhain
+    include sudo
     include debian-org
 
     case $smartarraycontroller {
@@ -43,11 +44,22 @@ node default {
         default: {}
     }
 
-    # test here first
     case $hostname {
-        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius:    { include sudo }
+        brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
         default:   {}
     }
+    case $hostname {
+       geo1,geo2,geo3:
+                  { include geodns }
+        default:   {}
+    }
+    case $hostname {
+       argento:
+                  { include monit }
+        default:   {}
+    }
+
 }
 
 node penalosa inherits default {