X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2593be0baa047e022dc13b25d866a6acc4798499;hb=4735d5cfacb06543383fa2857e64bddd587c9544;hp=6a6948c8545f3755fddfc72cec34e88165f38364;hpb=eb8d9c9ed20621f4081cb4049c4a6227aacb5f59;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6a6948c85..2593be0ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,15 +2,61 @@ Package {
     require => File["/etc/apt/apt.conf.d/local-recommends"]
 }
 
+File {
+    owner   => root,
+    group   => root,
+    mode    => 444,
+    ensure  => file,
+}
+
 node default {
     include munin-node
     include samhain
+    include sudo
     include debian-org
-    include exim
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
     }
+
+    case $mta {
+        "exim4":   { include exim }
+        default:   {}
+    }
+
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
+        default:   {}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        brahms,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+        default:   {}
+    }
+    case $hostname {
+	geo1,geo2,geo3:
+		   { include geodns }
+        default:   {}
+    }
+
 }
 
+node penalosa inherits default {
+    include hosts
+}