X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=452afff713641bb1694a6971f12a97b4d64ea44f;hb=3b0287c48ed0e419292fd4bb3205e4274b469a6b;hp=6b5f001e54c913e8f28cf3f2d72a8ad36b799a31;hpb=49f8b52b7524a67a3af1848099d2e030b6eb623a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b5f001e5..452afff71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,17 +2,40 @@ 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
 
-    if $smartarraycontroller {
-        include debian-proliant
+    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:   {}
+    }
 }
 
+node penalosa inherits default {
+    include hosts
+}