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 638b2be0d8e8ec6cac078496fabf137b7a0be746..094c4181e2d950e975f8123d59a9ce9110406a28 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,10 +9,17 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
-    include samhain
+    include sudo
     include debian-org
+    include monit
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -23,5 +30,37 @@ node default {
         "exim4":   { include exim }
         default:   {}
     }
+
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+                     include nagios::client
+       }
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        carver,rore,tartini:  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+        default:   {}
+    }
+    case $hostname {
+        geo1,geo2,geo3:
+                   { include geodns }
+        default:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}