X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3e98fe82128ddb5cfbf735265e5e7163f690d7ec;hb=b9e53ed63b36eba8d0a1cf5c194da940e663d297;hp=08f6c850de0fa640abe55bdc00f67ba8909bd685;hpb=7c4ae3fd1f04382f1478bc9d01275e29cde71355;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 08f6c850d..3e98fe821 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,10 +25,33 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
     case $hostname {
-        spohr:     { include nagiosclient }
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
         default:   {}
     }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        brahms,goetz,lafayette,malo,praetorius,puccini:
+                   { include buildd }
+	geo1,geo2,geo3:
+		   { include geodns }
+        default:   {}
+    }
+
 }
 
 node penalosa inherits default {