X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=cdecc6394c6193e8ef2c236215a0de3fba3272b3;hb=e37b56778fbe0945a8154a5a44abc29763c0a96f;hp=254cddfe81036e38ead30d2c60f32078af4a5b7e;hpb=718b253ce12b798796802cf231136d47fd239a3d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 254cddfe8..cdecc6394 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,10 +2,28 @@ 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 monit
+    include apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -16,5 +34,45 @@ node default {
         "exim4":   { include exim }
         default:   {}
     }
+
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        carver,rore,draghi,tartini,samosa,duarte:  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
+                   { include buildd }
+        default:   {}
+    }
+
+# maybe wait for rietz to be upgraded to lenny
+#    case $hostname {
+#        rietz,raff,klecker:
+#                   { include named-secondary }
+#        default:   {}
+#    }
+
+    case $hostname {
+        geo1,geo2,geo3:
+                   { include geodns }
+        default:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}