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

diff --git a/manifests/site.pp b/manifests/site.pp
index 55d18f819..09559ec34 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,6 +41,7 @@ node default {
 	include multipath
 	include popcon
 	include portforwarder
+	include postgres
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -55,22 +56,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
@@ -98,8 +83,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 {
@@ -114,10 +99,6 @@ node default {
 		include debian_org::radvd
 	}
 
-	if ($::postgres) {
-		include postgres
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}