X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2e636b58eac4133222c5d7e8b155aa5bf4fe37ef;hb=286d653b921ffe7927e7db247b186663e9fa9c05;hp=fce042a4b3f3b3cdd8db0082ca9c1b0ea05fed2b;hpb=cd6254e6d6e341a921015d6c8192953aa004ffb7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index fce042a4b..2e636b58e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,18 @@ 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
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,20 +32,16 @@ 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
+                      include motd::new
+        }
+        default: {
+		      include nagios::client
+                      include motd
+	}
     }
 
     case $apache2 {
@@ -63,5 +66,4 @@ node default {
 
 node penalosa inherits default {
     include hosts
-    include motd
 }