X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=08f6c850de0fa640abe55bdc00f67ba8909bd685;hb=bfa03605b82ed275ee8678c64769c85fe5b62c37;hp=1636b2f513dce9834c27355f45f89f34471da139;hpb=6ae3ef89656458f1fa082bd7d8ef83c97930ad15;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 1636b2f51..08f6c850d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,15 +2,34 @@ 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 exim
 
-    case $raidcontroller {
-        true:    { include debian-proliant }
+    case $smartarraycontroller {
+        "true":    { include debian-proliant }
         default: {}
     }
+
+    case $mta {
+        "exim4":   { include exim }
+        default:   {}
+    }
+
+    case $hostname {
+        spohr:     { include nagiosclient }
+        default:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}