X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=fce042a4b3f3b3cdd8db0082ca9c1b0ea05fed2b;hb=88fed06f1b8244ade89153deb977ca11af199e70;hp=114768ec4d4962249a79ed026e4fad7f15ac447d;hpb=b99f9b4fe8c0d8fff370dc2a144f2ed952e93add;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 114768ec4..fce042a4b 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 }
@@ -24,16 +25,43 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        morales:   {}
+        default:   { include samhain }
+    }
+
     case $hostname {
-        spohr,bartok:
-                   {
+        spohr:     {
                       import "nagios"
-                      include nagios-client
+                      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 penalosa inherits default {
     include hosts
+    include motd
 }