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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0c178c135..f6bce78ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -20,7 +20,8 @@ Service {
 
 node default {
 	# we really should rename this one
-	include site
+	include deprecated
+	include base
 
 	# this is magic: it will include whatever classes says we should
 	# include, based on the value of the "classes" array
@@ -31,7 +32,7 @@ node default {
 		ensure => absent
 	}
 
-	if getfromhash($site::nodeinfo, 'ganeti') {
+	if getfromhash($deprecated::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
@@ -40,23 +41,7 @@ node default {
 		include acpi
 	}
 
-	if $::mta == 'exim4' {
-		if getfromhash($site::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] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,gretchaninov,sibelius] {
 		include nfs_server
 	}
 
@@ -68,10 +53,6 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [geo3,wieck] {
-		include debian_org::radvd
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
@@ -79,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.')
+		}
+	}
 }