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 1636b2f513dce9834c27355f45f89f34471da139..094c4181e2d950e975f8123d59a9ce9110406a28 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,15 +2,65 @@ Package {
     require => File["/etc/apt/apt.conf.d/local-recommends"]
 }
 
+File {
+    owner   => root,
+    group   => root,
+    mode    => 444,
+    ensure  => file,
+}
+
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
-    include samhain
+    include sudo
     include debian-org
-    include exim
+    include monit
+    include motd
+    include samhain
+
+    case $smartarraycontroller {
+        "true":    { include debian-proliant }
+        default: {}
+    }
 
-    case $raidcontroller {
-        true:    { include debian-proliant }
+    case $mta {
+        "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
+}