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

diff --git a/manifests/site.pp b/manifests/site.pp
index 21351416a..953000e66 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,19 +50,15 @@ 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:
-                   { include buildd }
-        default:   {}
-    }
+     case extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
 
 # maybe wait for rietz to be upgraded to lenny
 #    case $hostname {