X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f4494e6b00d55236dac01c9d3500dd6bb1b3d1c0;hb=cf928c1ad5a2d7666669a3697c4431c0b0a2fe2c;hp=55d18f819bf5313391c9200101b170852458e3ba;hpb=2bac5cd16d08f76d19b66c40d386009c24e87b76;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 55d18f819..f4494e6b0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,6 +41,10 @@ node default {
 	include multipath
 	include popcon
 	include portforwarder
+	include postgres
+	include haveged
+	include huge_mem
+	include tcp_bbr
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -51,31 +55,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] {
+	if $::hostname in [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] {
 		include ganeti2
 	}
 
-	if $::hostname == 'dinis' {
-		include bacula::director
-	} else {
-		package { 'bacula-console':
-			ensure => purged;
-		}
-
-		file { '/etc/bacula/bconsole.conf':
-			ensure => absent;
-		}
-	}
-
-	if $::hostname == 'storace' {
-		include bacula::storage
-	}
-
 	if $::kernel == 'Linux' {
 		include linux
 		include acpi
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
@@ -98,8 +84,8 @@ node default {
 		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 {
@@ -114,15 +100,11 @@ node default {
 		include debian_org::radvd
 	}
 
-	if ($::postgres) {
-		include postgres
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }