X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2e636b58eac4133222c5d7e8b155aa5bf4fe37ef;hb=286d653b921ffe7927e7db247b186663e9fa9c05;hp=f2642306eb687f3c87522890fda79a41ff90126a;hpb=1bfbd12a4e812a98a12ffe780e45da4aa43a65be;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f2642306e..2e636b58e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,7 +18,9 @@ node default {
     include sudo
     include debian-org
     include monit
-    include motd
+    include samhain
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -30,20 +32,16 @@ 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
+                      include motd::new
+        }
+        default: {
+		      include nagios::client
+                      include motd
+	}
     }
 
     case $apache2 {