X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=094c4181e2d950e975f8123d59a9ce9110406a28;hb=779121229317745be14cd3f956c919185623c460;hp=528ceb5ce2da7727c8294b9b22474f9a3a70096d;hpb=425f5822935992acc0bb3340abc332e767913735;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 528ceb5ce..094c4181e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,17 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
-    include samhain
     include sudo
     include debian-org
+    include monit
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,36 +31,34 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     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: {}
     }
 
     case $hostname {
-        brahms,geodel,goetz,lafayette,malo,praetorius,puccini:
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
                    { include buildd }
         default:   {}
     }
     case $hostname {
-	geo1,geo2,geo3:
-		   { include geodns }
+        geo1,geo2,geo3:
+                   { include geodns }
         default:   {}
     }
-
 }
 
 node penalosa inherits default {