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

diff --git a/manifests/site.pp b/manifests/site.pp
index 114768ec4..f4c7955a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,14 +24,30 @@ 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: {}
+    }
+
+    # test here first
+    case $hostname {
+        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius,schein,villa,lobos,steffani,kassia,pergolesi,lafayette,rem,albeniz,goetz,smetana,allegri,puccini,ball,argento,arcadelt,dijkstra,schumann,caballero,voltaire,pescetti,mundy,agricola,goedel,lebrun,mayer,mayr,merulo,morales,murphy,paer,saens,schroeder,spontini,widor,zelenka,agnesi,piatti,powell,samosa,gluck,rietz,unger,tartini,mahler,raff,chopin,ravel:    { include sudo }
+        default:   {}
+    }
 }
 
 node penalosa inherits default {