X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=c8d8cd5ebae8815f89de57eabcd6cfc3bfbee4e9;hb=22446678cf567eb2c458a4dd30ce9c0282f4ad33;hp=452afff713641bb1694a6971f12a97b4d64ea44f;hpb=8306bbfe8973acaa6e3c57b81a52296528624091;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 452afff71..c8d8cd5eb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,10 +9,19 @@ 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 samhain
+    include motd
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -24,14 +33,32 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        carver,rore,tartini:  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+        default:   {}
+    }
+    case $hostname {
+        geo1,geo2,geo3:
+                   { include geodns }
         default:   {}
     }
 }