X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2593be0baa047e022dc13b25d866a6acc4798499;hb=4735d5cfacb06543383fa2857e64bddd587c9544;hp=095a2c6adff556553459273b2a4691256a24729d;hpb=14fe252ef23ef30a1901db8661d06510e45a4b33;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 095a2c6ad..2593be0ba 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,36 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
     case $hostname {
-        spohr,bartok:
-                   {
+        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,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
         default:   {}
     }
+    case $hostname {
+	geo1,geo2,geo3:
+		   { include geodns }
+        default:   {}
+    }
+
 }
 
 node penalosa inherits default {