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

diff --git a/manifests/site.pp b/manifests/site.pp
index e10693304..88f565d95 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,10 @@ Service {
 }
 
 node default {
-	include site
+	# 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
@@ -43,25 +46,22 @@ node default {
 	include portforwarder
 	include postgres
 	include haveged
+	include huge_mem
+	include tcp_bbr
+	include certregen::client
 
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
+	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,aagaard,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' {
@@ -80,11 +80,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
 	}
 
@@ -105,6 +101,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }