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 fce042a..c8d8cd5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,19 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
     include sudo
     include debian-org
     include monit
+    include samhain
+    include motd
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,20 +33,14 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
-        morales:   {}
-        default:   { include samhain }
-    }
-
-    case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+                     include nagios::client
+       }
     }
 
     case $apache2 {
@@ -63,5 +65,4 @@ node default {
 
 node penalosa inherits default {
     include hosts
-    include motd
 }