X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=856d47d70bf071fce01e79e3fbff764e17b37e1d;hb=b7840b5dee51a6081d34516f9d171266e0ee7336;hp=24c67361e14979f00b6958d65c8680ddd4de21de;hpb=132ab39b9bfd5283d0452c6972f5af235bdc92bf;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 24c67361e..856d47d70 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,30 @@
+Package {
+    require => File["/etc/apt/apt.conf.d/local-recommends"]
+}
+
+File {
+    owner   => root,
+    group   => root,
+    mode    => 444,
+    ensure  => file,
+}
+
 node default {
-    include ntp
     include munin-node
+    include samhain
+    include debian-org
+
+    case $smartarraycontroller {
+        "true":    { include debian-proliant }
+        default: {}
+    }
+
+    case $mta {
+        "exim4":   { include exim }
+        default:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}