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

diff --git a/manifests/site.pp b/manifests/site.pp
index 171d077a0..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 {
@@ -24,23 +25,41 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
     case $hostname {
-        spohr,bartok,geo1:
-                   {
+        spohr:     {
                       import "nagios"
-                      include nagios-client
+                      include nagios-server
                    }
         default:   {}
     }
 
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
+        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 {