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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9e0b813c2..ba5b9a128 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,123 +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 hardware
-	include nagios::client
-	include resolv
-	include roles
-	include motd
-	include unbound
-	include bacula::client
-	include autofs
-	include lvm
-	include multipath
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
-	}
-
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
-		include ganeti2
-	}
+	# we really should rename this one
+	include deprecated
+	include base
 
-	if $::hostname == 'dinis' {
-		include bacula::director
-	} else {
-		package { 'bacula-console':
-			ensure => purged;
-		}
+	# this is magic: it will include whatever classes says we should
+	# include, based on the value of the "classes" array
+	hiera_include('classes')
 
-		file { '/etc/bacula/bconsole.conf':
-			ensure => absent;
-		}
+	include roles::pubsub::client
+	class { 'roles::udldap::client':
+		ensure => absent
 	}
 
-	if $::hostname == 'backuphost' {
-		include bacula::storage
+	if getfromhash($deprecated::nodeinfo, 'ganeti') {
+		include ganeti2
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
-	}
-
-	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
+		include acpi
 	}
 
-	if $::hostname in [geo1,geo2,geo3] {
-		include named::geodns
-	}
-
-	#if $::hostname in [diabelli,nono,tchaikovsky] {
-	#	include dacs
-	#}
-
-	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
-		include nfs-server
-	}
-
-	if $::hostname == 'vieuxtemps' {
-		include varnish
+	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
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
-	}
-
-	if ($::postgres) {
-		include postgres
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish_pkgmirror
+	}
+
+	if $::apache2 {
+		if ! defined(Class['apache2']) {
+			fail('We have apache installed but no role pulled it in.')
 		}
 	}
 }