X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=452afff713641bb1694a6971f12a97b4d64ea44f;hb=5a40c34e0e576183b800c6981826a6c3a444c13b;hp=47b8c7e8557da456935a81f5abd3cbf16cf7c045;hpb=ba4dff5433a1aa3d1ddb8fb37484f39b1617b6b7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 47b8c7e85..452afff71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,15 +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
-    include exim
 
-    case $raidcontroller {
+    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
+}