X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=c3f57bbe4776e83fbfde938c6be752ac0c7999fd;hb=616b65a445b0ea9eaecc5f4c4ee72e0fcc69efb6;hp=8690e553a427362cc39a898866855be7b3c4355a;hpb=16fc4ca2f8d503059fa321acaf04a1902f94d714;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 8690e553..c3f57bbe 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,7 +103,7 @@ 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
 	}
 
@@ -135,3 +137,4 @@ node default {
 		}
 	}
 }
+