X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=4ce4dde44e5f079ad7ce0eb01f59a2d2148d10f1;hb=6a9da2f1d0bb9e0259b428f4719434467aa7c458;hp=a649d902b030f1281c445acf2d091f8d2299acd8;hpb=042f49e722b8375b0453073ae29aabd0b6cde7e8;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a649d902b..4ce4dde44 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,7 +37,7 @@ 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] {
 		include ganeti2
 	}
 
@@ -82,7 +82,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
@@ -96,6 +96,10 @@ node default {
 		include nfs-server
 	}
 
+	if $::hostname == 'vieuxtemps' {
+		include varnish
+	}
+
 	if $::brokenhosts {
 		include hosts
 	}
@@ -104,21 +108,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', 'diabelli', 'draghi', 'widor', 'wolkenstein'] {
-		@@bacula::node { $::fqdn: }
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
+	}
 }