X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=41d88df462434ab0159fc9b46632598d65d601d0;hb=344f8c0d25aa99d14c8cbe9d958c127ded4525ef;hp=6123122491d6661c7e8a7f66b40a7a283110f8fe;hpb=8fc104f1c82d84fb71ed3f3b5e8ac7708dea6d86;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 61231224..41d88df4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,13 +35,26 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
-	if $::hostname in [pasquini,tristano] {
+	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' {
+		include bacula::storage
 	}
 
 	if $::kernel == Linux {
@@ -79,7 +92,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -97,11 +110,15 @@ node default {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hoster in [ynic] {
+		include lldp
+	}
 }