X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=86300969088c9fb4deb139cbf76619016b25e3e9;hb=59997b2444a5333b34b619882ffcbcca6e449aaf;hp=57fb3072ac3d64f9f1ca4a4775d0e292d4f741fa;hpb=f0a21590094be0f0d43b984de2b151dcf03b8b45;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 57fb3072a..863009690 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,20 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
     include sudo
     include debian-org
     include monit
+    include motd
+    include samhain
+
+    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    debug($nodeinfo)
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,25 +34,19 @@ 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 {
         "true":    { case $hostname {
-                        "carver":  { include apache2 }
+                        carver,rore,tartini:  { include apache2 }
                         default:   {}
                    } }
         default: {}