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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8a09872c..bab825db 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,12 +37,24 @@ node default {
 	include unbound
 	include bacula::client
 
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
 		include ganeti2
 	}
 
+	if $::hostname in [bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
+		include multipath
+	}
+
 	if $::hostname == 'dinis' {
 		include bacula::director
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
+
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
@@ -74,7 +86,7 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
@@ -84,10 +96,14 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach] {
+	if $::hostname in [beethoven,spohr,stabile,beach,glinka] {
 		include nfs-server
 	}
 
+	if $::hostname == 'vieuxtemps' {
+		include varnish
+	}
+
 	if $::brokenhosts {
 		include hosts
 	}
@@ -96,21 +112,25 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
-	if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
-		@@bacula::node { $::fqdn: }
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
+	}
 }