buildd on murphy

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0af9a890a164aca3d1379bff89124d376acabaec..7b60010346e711a64182147c12e304fc38d6b39e 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,8 +19,11 @@ node default {
     include debian-org
     include monit
     include samhain
+    include apt-keys
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -36,11 +39,9 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
-                      include motd-new
         }
         default: {
                      include nagios::client
-                      include motd
        }
     }
 
@@ -53,7 +54,7 @@ node default {
     }
 
     case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+        ancina,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini:
                    { include buildd }
         default:   {}
     }