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

diff --git a/manifests/site.pp b/manifests/site.pp
index 41d88df4..9828f659 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,clementi] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini] {
 		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
@@ -92,10 +92,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
 	}
@@ -104,7 +108,9 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
@@ -118,7 +124,9 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster in [ynic] {
-		include lldp
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
 	}
 }