X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=86b8c718aeff8a7f01dd743775038303bae3adce;hb=b1e1fbd9fddbcb3715eb914c2a01c6f8408dfea5;hp=51c46711539b3d589fcf3d87530c5e5eb700c047;hpb=7c53343268f57db530dc6c558a5422b7dc0047cd;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 51c467115..86b8c718a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -11,8 +11,9 @@ File {
 
 node default {
     include munin-node
-    include samhain
+    include sudo
     include debian-org
+    include monit
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -27,6 +28,11 @@ node default {
     import "nagios"
     include nagios-client
 
+    case $hostname {
+        morales:   {}
+        default:   { include samhain }
+    }
+
     case $hostname {
         spohr:     {
                       import "nagios"
@@ -37,11 +43,22 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        "carver":  { import "apache2" }
+                        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:   {}
+    }
 }
 
 node penalosa inherits default {