Oh yes, line wrap markers

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c658619..f3e19ad 100644 (file)
--- 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: {