X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=93749bfc1505f51c532bbe3966914e279cc9e2a0;hb=991b6ec9c0c8ece2935c922b9c5c315ccde6deb8;hp=f2ee7b076f9d3c857656939d7f8075bf9de66bcf;hpb=57781472bcaf93378e65805773a726c6c73599b5;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f2ee7b076..93749bfc1 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] {
+	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
 	}
 
@@ -64,7 +64,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'backuphost' {
+	if $::hostname == 'storace' {
 		include bacula::storage
 	}
 
@@ -90,7 +90,9 @@ node default {
 	}
 
 	if $::apache2 {
-		include apache2
+		if !$::hostname in [oyens] {
+			include apache2
+		}
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
@@ -101,14 +103,10 @@ node default {
 	#	include dacs
 	#}
 
-	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
+	if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
 		include nfs-server
 	}
 
-	if $::hostname == 'vieuxtemps' {
-		include varnish
-	}
-
 	if $::brokenhosts {
 		include hosts
 	}