X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b9382e2606f90e215466b0c42918bd5faffce49a;hb=87db6fdf68db406ed80a5d6c8bf89e4f4428b365;hp=775c6a1752a37c9c902f1ed15891998ad5121b11;hpb=a0a7afb0fe5e089489107dcb51e7e14d349754f5;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 775c6a17..b9382e26 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,byrd] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny] {
 		include ganeti2
 	}
 
 	if $::hostname == 'dinis' {
 		include bacula::director
-	}
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
 
-	if $::hostname in [berlioz, biber, draghi, widor, wolkenstein] {
-		include bacula::client
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
@@ -91,6 +96,10 @@ node default {
 		include nfs-server
 	}
 
+	if $::hostname == 'vieuxtemps' {
+		include varnish
+	}
+
 	if $::brokenhosts {
 		include hosts
 	}
@@ -105,11 +114,17 @@ node default {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+        if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
+	}
 }