X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=d8d74907a10d2a3680a478e613ec0a698de8670a;hb=9ea014717bb5a43ef416e03ad07fbe544fb7cbbc;hp=c658619d2f8631d8c426822ddb5566dc3fc0a64c;hpb=9eda91b6c7d2f46f52676aca020e9645a509bdd9;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c658619d2..d8d74907a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,9 +18,12 @@ node default {
     include sudo
     include debian-org
     include monit
-    include motd
     include samhain
 
+    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    notice($nodeinfo.class)
+    notice($nodeinfo)
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
@@ -31,15 +34,15 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
         spohr: {
                       include nagios::server
+                      include motd::new
         }
         default: {
 		      include nagios::client
+                      include motd
 	}
     }