X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ba5b9a128a8b7643e48610442ce87860dc8c5c7b;hb=d824f9b2ae6fe566ad3c47c9d4f0c6aaa1057242;hp=6ff112d29e7ff5a4f0df9cc5d2fe72082ed7ddb7;hpb=d0c098685b92334a611a0c596a35f538b95ead47;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6ff112d29..ba5b9a128 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,22 +41,6 @@ node default {
 		include acpi
 	}
 
-	if $::mta == 'exim4' {
-		if getfromhash($deprecated::nodeinfo, 'heavy_exim') {
-			include exim::mx
-		} else {
-			include exim
-		}
-	} elsif $::mta == 'postfix' {
-		include postfix
-	} else {
-		include exim
-	}
-
-	if $::apache2 {
-		include apache2
-	}
-
 	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}
@@ -69,10 +53,6 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [geo3,wieck] {
-		include debian_org::radvd
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
@@ -80,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.')
+		}
+	}
 }