X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ba5b9a128a8b7643e48610442ce87860dc8c5c7b;hb=28eef0a07ec7f7f635c45047e8d1cfd6756eaefe;hp=88f565d95d7bbbea8b12fbaed79502ed2f664f43;hpb=5f25e6e23fc7a0f900ef5c32d066f91c82b9cfdb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 88f565d95..ba5b9a128 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,43 +19,20 @@ Service {
 }
 
 node default {
+	# we really should rename this one
+	include deprecated
+	include base
+
 	# this is magic: it will include whatever classes says we should
 	# include, based on the value of the "classes" array
 	hiera_include('classes')
 
-	include munin
-	include syslog_ng
-	include sudo
-	include ssh
-	include debian_org
-	include monit
-	include time
-	include ssl
-	include hardware
-	include nagios::client
-	include resolv
-	include roles
-	include motd
-	include unbound
-	include bacula::client
-	include autofs
-	include dsa_lvm
-	include grub
-	include multipath
-	include popcon
-	include portforwarder
-	include postgres
-	include haveged
-	include huge_mem
-	include tcp_bbr
-	include certregen::client
-
 	include roles::pubsub::client
 	class { 'roles::udldap::client':
 		ensure => absent
 	}
 
-	if getfromhash($site::nodeinfo, 'ganeti') {
+	if getfromhash($deprecated::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
@@ -64,22 +41,6 @@ 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] {
 		include nfs_server
 	}
@@ -92,10 +53,6 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [geo3,wieck] {
-		include debian_org::radvd
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
@@ -103,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.')
+		}
+	}
 }