X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f3e19addc9ce4c5e7386cf656e97fb38a1dc3cb5;hb=cc4d1e9f6a82195154bf8705a3f5f788aed666e6;hp=91e6f59cffb52a069bf4d51a6a6b173ea0a5a8aa;hpb=787e0905b8e742bb9d06e16e565e6c8ae01b9e69;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 91e6f59cf..f3e19addc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,10 +18,12 @@ node default {
     include sudo
     include debian-org
     include monit
-    include motd
     include samhain
+    include apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }