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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8e72e7d33..ba5b9a128 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,88 +19,30 @@ Service {
 }
 
 node default {
-	include site
-	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
+	# we really should rename this one
+	include deprecated
+	include base
 
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
-	}
-
-	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
-		include ganeti2
-	}
-
-	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 == 'storace' {
-		include bacula::storage
+	if getfromhash($deprecated::nodeinfo, 'ganeti') {
+		include ganeti2
 	}
 
 	if $::kernel == 'Linux' {
 		include linux
 		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
-	}
-
-	if $::hostname in [geo1,geo2,geo3] {
-		include named::geodns
-	}
-
-	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
-		include nfs-server
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+		include nfs_server
 	}
 
 	if $::brokenhosts {
@@ -111,15 +53,17 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [geo3,wieck] {
-		include debian_org::radvd
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
+	}
+
+	if $::apache2 {
+		if ! defined(Class['apache2']) {
+			fail('We have apache installed but no role pulled it in.')
+		}
 	}
 }