X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=a01c7c3af7c4d2d56b2b4160ada06184fae50d23;hb=8314f82dff0956119ced6b782c9c6df00508216e;hp=97e962abe1ca4db8ae9ede116665ef00f85c3b43;hpb=c836c2a80e2fd64e4f18cdbba39a7eda1f241e89;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 97e962abe..a01c7c3af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,6 +42,7 @@ node default {
 	include popcon
 	include portforwarder
 	include postgres
+	include haveged
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -56,22 +57,6 @@ node default {
 		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,7 +84,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,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}