X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6b8be82d0a121740f0aafd02791eb98f15764e72;hb=e004cf0926cc3bdb95c0d71c79cd734b1e1cc806;hp=665c635a242c7cc1314ce6a84d1dd7003fc9e448;hpb=20401eaf2ca4fbe7da1fa791a94ea2a68f9a867b;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 665c635a2..6b8be82d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,7 +43,9 @@ node default {
 	include portforwarder
 	include postgres
 	include haveged
-	include hugemem
+	include huge_mem
+	include tcp_bbr
+	include certregen::client
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -54,15 +56,13 @@ node default {
 		}
 	}
 
-	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' {
@@ -85,7 +85,7 @@ node default {
 		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 +106,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }