X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=46becc707a9ba88b902302c7450f810760fa149c;hb=9c2c9e0a88142537050bf99c40dc64696adcf72d;hp=8a09872c7533aa016b42a1ce634db6e018d0e936;hpb=946fd40efdaf9505d396d08345ab1dd03dfbe317;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 8a09872c..46becc70 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,12 +37,20 @@ node default {
 	include unbound
 	include bacula::client
 
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
 		include ganeti2
 	}
 
 	if $::hostname == 'dinis' {
 		include bacula::director
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
+
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
@@ -102,11 +110,11 @@ node default {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
-	if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
 		@@bacula::node { $::fqdn: }
 	}