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

diff --git a/manifests/site.pp b/manifests/site.pp
index fce042a4b..f3e19addc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,21 @@ 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 apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,20 +35,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 +67,4 @@ node default {
 
 node penalosa inherits default {
     include hosts
-    include motd
 }