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

diff --git a/manifests/site.pp b/manifests/site.pp
index 3e98fe821..fce042a4b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -11,9 +11,9 @@ File {
 
 node default {
     include munin-node
-    include samhain
     include sudo
     include debian-org
+    include monit
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -28,6 +28,11 @@ node default {
     import "nagios"
     include nagios-client
 
+    case $hostname {
+        morales:   {}
+        default:   { include samhain }
+    }
+
     case $hostname {
         spohr:     {
                       import "nagios"
@@ -38,22 +43,25 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        "carver":  { include apache2 }
+                        carver,rore,tartini:  { include apache2 }
                         default:   {}
                    } }
         default: {}
     }
 
     case $hostname {
-        brahms,goetz,lafayette,malo,praetorius,puccini:
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
                    { include buildd }
-	geo1,geo2,geo3:
-		   { include geodns }
         default:   {}
     }
-
+    case $hostname {
+        geo1,geo2,geo3:
+                   { include geodns }
+        default:   {}
+    }
 }
 
 node penalosa inherits default {
     include hosts
+    include motd
 }