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

diff --git a/manifests/site.pp b/manifests/site.pp
index c658619d2..2e636b58e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,9 +18,10 @@ 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 }
         default: {}
@@ -31,15 +32,15 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
         spohr: {
                       include nagios::server
+                      include motd::new
         }
         default: {
 		      include nagios::client
+                      include motd
 	}
     }