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

diff --git a/manifests/site.pp b/manifests/site.pp
index d8d74907a..f3e19addc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,10 +19,11 @@ node default {
     include debian-org
     include monit
     include samhain
+    include apt-keys
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-    notice($nodeinfo.class)
-    notice($nodeinfo)
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -38,11 +39,9 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
-                      include motd::new
         }
         default: {
 		      include nagios::client
-                      include motd
 	}
     }