X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=0fae8a63c02cf0ab534d809829ff62011aa99dab;hb=f4554844dfb091411aa6a8c98b97b49a1a21e837;hp=fce042a4b3f3b3cdd8db0082ca9c1b0ea05fed2b;hpb=cd6254e6d6e341a921015d6c8192953aa004ffb7;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index fce042a4..0fae8a63 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,32 +35,26 @@ 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,rore,tartini:  { include apache2 }
+                        carver,rore,draghi,tartini,samosa:  { include apache2 }
                         default:   {}
                    } }
         default: {}
     }
 
     case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
                    { include buildd }
         default:   {}
     }
@@ -63,5 +67,4 @@ node default {
 
 node penalosa inherits default {
     include hosts
-    include motd
 }