X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=a649d902b030f1281c445acf2d091f8d2299acd8;hb=042f49e722b8375b0453073ae29aabd0b6cde7e8;hp=775c6a1752a37c9c902f1ed15891998ad5121b11;hpb=a0a7afb0fe5e089489107dcb51e7e14d349754f5;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 775c6a17..a649d902 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,7 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
 	if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
 		include ganeti2
@@ -42,10 +43,14 @@ node default {
 
 	if $::hostname == 'dinis' {
 		include bacula::director
-	}
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
 
-	if $::hostname in [berlioz, biber, draghi, widor, wolkenstein] {
-		include bacula::client
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
@@ -109,6 +114,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in ['berlioz', 'biber', 'diabelli', 'draghi', 'widor', 'wolkenstein'] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}