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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8e72e7d33..12e8e51e3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,6 +42,8 @@ node default {
 	include popcon
 	include portforwarder
 	include postgres
+	include haveged
+	include huge_mem
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -52,26 +54,10 @@ 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 [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] {
 		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
@@ -99,8 +85,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,senfter,gretchaninov,sibelius] {
+		include nfs_server
 	}
 
 	if $::brokenhosts {