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

diff --git a/manifests/site.pp b/manifests/site.pp
index e810e05dc..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 }
@@ -23,8 +24,43 @@ node default {
         "exim4":   { include exim }
         default:   {}
     }
+
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        morales:   {}
+        default:   { include samhain }
+    }
+
+    case $hostname {
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
+        default:   {}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        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 master inherits default {
-    include exim-extended
+node penalosa inherits default {
+    include hosts
 }