X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ba5b9a128a8b7643e48610442ce87860dc8c5c7b;hb=33a685862291e6f3c0c7f9df702b930430bbe419;hp=acde9e3992568a7a9c28fe5d06e114c0fb57a42d;hpb=51a7173ff33621ad8f203107d559fc495c91e756;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index acde9e399..ba5b9a128 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,87 +19,51 @@ Service {
 }
 
 node default {
-	include site
-	include munin
-	include syslog-ng
-	include sudo
-	include ssh
-	include debian-org
-	include monit
-	include ntp
-	include ntpdate
-	include ssl
-	include motd
-	include hardware
-	include nagios::client
-	include resolv
-	include roles
-	include unbound
+	# we really should rename this one
+	include deprecated
+	include base
 
-	if $::hostname in [pasquini,tristano] {
-		include ganeti2
-	}
+	# this is magic: it will include whatever classes says we should
+	# include, based on the value of the "classes" array
+	hiera_include('classes')
 
-	if $::kernel == Linux {
-		include linux
-		if $::kvmdomain {
-			include acpi
-		}
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
+	include roles::pubsub::client
+	class { 'roles::udldap::client':
+		ensure => absent
 	}
 
-	if $::mta == 'exim4' {
-		if getfromhash($site::nodeinfo, 'heavy_exim') {
-			include exim::mx
-		} else {
-			include exim
-		}
-	} else {
-		include postfix
-	}
-
-	if $::apache2 {
-		include apache2
-	}
-
-	if $::rsyncd {
-		include rsyncd-log
-	}
-
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
-		include named::geodns
+	if getfromhash($deprecated::nodeinfo, 'ganeti') {
+		include ganeti2
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
-		include dacs
+	if $::kernel == 'Linux' {
+		include linux
+		include acpi
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
-		include nfs-server
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+		include nfs_server
 	}
 
 	if $::brokenhosts {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
+	if $::samhain {
+		include samhain
 	}
 
-	include samhain
-
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
+	if $::spamd {
+		munin::check { 'spamassassin': }
 	}
 
-	if ($::postgres84 or $::postgres90) {
-		include postgres
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish_pkgmirror
 	}
 
-	if $::spamd {
-		munin::check { 'spamassassin': }
+	if $::apache2 {
+		if ! defined(Class['apache2']) {
+			fail('We have apache installed but no role pulled it in.')
+		}
 	}
 }