X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=10156252372129119ce4fc196e9a4b32c3bd16d4;hb=4ed2c73059441caf22a019f4acf51822574708b7;hp=a382663e76ced2230d4a80d25f572506f0fad569;hpb=1ef5305a212a75308012f5a29a64223ea04ca5cd;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a382663e..10156252 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, biber] {
-		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
 	}
 
@@ -105,7 +110,7 @@ node default {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}