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

diff --git a/manifests/site.pp b/manifests/site.pp
index 3c5923fcb..d5398f827 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,11 +37,17 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        carver:     { import "apache2" }
+                        "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:    { include sudo }
+        default:   {}
+    }
 }
 
 node penalosa inherits default {