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

diff --git a/manifests/site.pp b/manifests/site.pp
index 12e8e51e3..0c178c135 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,50 +19,25 @@ Service {
 }
 
 node default {
+	# we really should rename this one
 	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
-	include haveged
-	include huge_mem
-
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
+
+	# this is magic: it will include whatever classes says we should
+	# include, based on the value of the "classes" array
+	hiera_include('classes')
+
+	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,conova-node01,conova-node02] {
+	if getfromhash($site::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
 	if $::kernel == 'Linux' {
 		include linux
 		include acpi
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
@@ -81,11 +56,7 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [geo1,geo2,geo3] {
-		include named::geodns
-	}
-
-	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov,sibelius] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}
 
@@ -106,6 +77,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }