X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=c3f57bbe4776e83fbfde938c6be752ac0c7999fd;hb=251e7bcc5bd4288912203f53bf19f9116801cd54;hp=af09ec549977c3654b534bbd0aded905ac3caa5b;hpb=96f9c816e7c215f7b0f2d853ebffd9902690dbaf;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index af09ec549..c3f57bbe4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
 		}
 	}
 
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
 		include ganeti2
 	}
 
@@ -90,7 +90,9 @@ node default {
 	}
 
 	if $::apache2 {
-		include apache2
+		if !($::hostname in [oyens]) {
+			include apache2
+		}
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
@@ -135,3 +137,4 @@ node default {
 		}
 	}
 }
+