Move to the new motd generation setup

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 5fb46ea..c8d8cd5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,8 +19,9 @@ node default {
     include debian-org
     include monit
     include samhain
+    include motd
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -36,11 +37,9 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
-                      include motd::new
         }
         default: {
                      include nagios::client
-                      include motd
        }
     }