Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index f264230..094c418 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 }
@@ -30,20 +31,14 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    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 {