X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=99af3fce6c6ce11e270e5d37180cbf067478c30b;hb=38c1d03fd5280e429c20bfd702effb497cff2ee1;hp=21fb3d0ac6530518651f5a5e5ed762a14a6ebe4b;hpb=75aa99b6e7296e293db4e0e8d11621f341098804;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 21fb3d0ac..99af3fce6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -12,6 +12,7 @@ File {
 node default {
     include munin-node
     include samhain
+    include sudo
     include debian-org
 
     case $smartarraycontroller {
@@ -37,11 +38,28 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        carver:     { import "apache2" }
+                        "carver":  { include apache2 }
                         default:   {}
-                   }
+                   } }
         default: {}
     }
+
+    case $hostname {
+        brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+        default:   {}
+    }
+    case $hostname {
+	geo1,geo2,geo3:
+		   { include geodns }
+        default:   {}
+    }
+    case $hostname {
+	argento:
+		   { include monit }
+        default:   {}
+    }
+
 }
 
 node penalosa inherits default {