X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=e939261b44b6dc9547e42e1865455b3ed8effcfc;hb=8b411205b3bf9d12a86333b37fc1d37375d5fe52;hp=29ac94ff41e15df25b4933e567b78a35a8a3e571;hpb=1f37c1198a12c740639535f69d3f42b841c0aca5;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 29ac94ff4..e939261b4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,10 +41,6 @@ node default {
 		include acpi
 	}
 
-	if $::apache2 {
-		include apache2
-	}
-
 	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}
@@ -68,4 +64,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.')
+		}
+	}
 }