X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=29f9d5aa49d9e940aec00b60a6511da4ef68cccc;hb=501e88f916b62cdc232b204457a82ee77ab089b2;hp=931c6d0f074aa8314a766d96a3adc61021c7decc;hpb=efe9f7a25834c736407891e7a1b0832dba16ba8b;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 931c6d0f..29f9d5aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,17 +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] {
-		include bacula::client
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
@@ -87,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
 	}
 
@@ -109,6 +114,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in ['beethoven', 'berlioz', 'biber', 'diabelli', 'dinis', 'draghi', 'widor', 'wolkenstein'] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}