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

diff --git a/manifests/site.pp b/manifests/site.pp
index e8f5dfcb6..2e636b58e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,11 +18,9 @@ node default {
     include sudo
     include debian-org
     include monit
-    include motd
     include samhain
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-    notice($nodeinfo)
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -38,9 +36,11 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
+                      include motd::new
         }
         default: {
 		      include nagios::client
+                      include motd
 	}
     }