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 f2642306eb687f3c87522890fda79a41ff90126a..c658619d2f8631d8c426822ddb5566dc3fc0a64c 100644 (file)
--- 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 {