From: Stephen Gran <steve@lobefin.net>
Date: Sat, 25 Apr 2009 16:38:11 +0000 (+0100)
Subject: Remove special casing for morales and samhain
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9eda91b6c7d2f46f52676aca020e9645a509bdd9;p=dsa-puppet.git

Remove special casing for morales and samhain
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/manifests/site.pp b/manifests/site.pp
index f2642306..c658619d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,6 +19,7 @@ node default {
     include debian-org
     include monit
     include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -34,16 +35,12 @@ node default {
     include nagios-client
 
     case $hostname {
-        morales:   {}
-        default:   { include samhain }
-    }
-
-    case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
 
     case $apache2 {