X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2933d23fa81c6517d7e8394c839b8d533e63bfc6;hb=59bfcedf5fe439e370d7fbebaaa2c70cd3e03fad;hp=22cf231e6d10ab502eebea7b551cd51ccefcd6e5;hpb=c828a1b822d2987966270de951718a77b2a08511;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 22cf231e6..2933d23fa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,25 +42,23 @@ node default {
 	include popcon
 	include portforwarder
 	include postgres
-
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
+	include haveged
+	include huge_mem
+	include tcp_bbr
+	include certregen::client
+
+	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] {
+	if getfromhash($site::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
 	if $::kernel == 'Linux' {
 		include linux
 		include acpi
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
@@ -83,7 +81,7 @@ node default {
 		include named::geodns
 	}
 
-	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}
 
@@ -104,6 +102,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }