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

diff --git a/manifests/site.pp b/manifests/site.pp
index e810e05dc..452afff71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -23,8 +23,19 @@ node default {
         "exim4":   { include exim }
         default:   {}
     }
+
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
+        default:   {}
+    }
 }
 
-node master inherits default {
-    include exim-extended
+node penalosa inherits default {
+    include hosts
 }