X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=86b8c718aeff8a7f01dd743775038303bae3adce;hb=b1e1fbd9fddbcb3715eb914c2a01c6f8408dfea5;hp=0fc7339348139545df0c62810fd69e6f6f73a7f3;hpb=5f602676e91984034218e3efe8a54f8984edbe2e;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 0fc733934..86b8c718a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,66 @@
+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 debian_org
+    include sudo
+    include debian-org
+    include monit
+
+    case $smartarraycontroller {
+        "true":    { include debian-proliant }
+        default: {}
+    }
+
+    case $mta {
+        "exim4":   { include exim }
+        default:   {}
+    }
+
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        morales:   {}
+        default:   { include samhain }
+    }
+
+    case $hostname {
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
+        default:   {}
+    }
+
+    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
+}