X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2e8000b060e8dd2786672563a8868c12e2eb25a8;hb=e216061f35961159f2dbac3f4268f6acedc66c67;hp=21351416a3aecadd9f6be967c6001ba129901b50;hpb=e3b2ac9b288d8001ace626d659aa862906d22da7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 21351416a..2e8000b06 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,13 +50,10 @@ node default {
 	}
     }
 
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           default: { }
+     }
 
     case $hostname {
         ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer: