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

diff --git a/manifests/site.pp b/manifests/site.pp
index c658619d2..f3e19addc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,8 +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")
+
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -31,8 +35,6 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
         spohr: {