X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=e56ca7d112f44be264fb56a366d9d7a78c82bed9;hb=b9671e1043fdfc5f3aea127f51562dae2e9c9cf6;hp=a504ecbc1b84cc32eb1c9e7a0e45e47da4a51c09;hpb=6a6f323df04506d53a2d5fb8e30765ec216877d9;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a504ecbc..e56ca7d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,18 +35,22 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
-	if $::hostname in [pasquini,tristano,bertali,boito] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
 		include ganeti2
 	}
 
 	if $::hostname == 'dinis' {
 		include bacula::director
-	}
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
 
-	if $::hostname in [berlioz, biber, draghi] {
-		include bacula::client
-		@@bacula::node { $::fqdn: }
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
@@ -88,7 +92,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -110,6 +114,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}