X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d5398f82772011d63a1fedc5155c01fd3c2410db;hb=984cecae1aeba2ae9b8e799ea962d425da943940;hp=003de9cf8d83b445ff919c20a3b5452e56bc95bc;hpb=2743834c6f34d2b842228f0259d071ca080a3e42;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 003de9cf8..d5398f827 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,8 +24,28 @@ node default {
         default:   {}
     }
 
+    import "nagios"
+    include nagios-client
+
+    case $hostname {
+        spohr:     {
+                      import "nagios"
+                      include nagios-server
+                   }
+        default:   {}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        "carver":  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    # test here first
     case $hostname {
-        spohr:     { include nagios-client }
+        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:    { include sudo }
         default:   {}
     }
 }