X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f6bce78ee441aee69b2a5e5f5ef5605db7faa7cf;hb=refs%2Fheads%2Fsalsa;hp=29ac94ff41e15df25b4933e567b78a35a8a3e571;hpb=368e147f10b8e748f7e171a15568a94d79599039;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 29ac94ff4..f6bce78ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,11 +41,7 @@ node default {
 		include acpi
 	}
 
-	if $::apache2 {
-		include apache2
-	}
-
-	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,gretchaninov,sibelius] {
 		include nfs_server
 	}
 
@@ -57,10 +53,6 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [geo3,wieck] {
-		include debian_org::radvd
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
@@ -68,4 +60,10 @@ node default {
 	if $::hostname == 'pkgmirror-csail' {
 		include varnish_pkgmirror
 	}
+
+	if $::apache2 {
+		if ! defined(Class['apache2']) {
+			fail('We have apache installed but no role pulled it in.')
+		}
+	}
 }