X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8ef2c6c087583a25fef6408f26ae4895d66ae1de;hb=89bb1a2bdf42ecd9535e20f19c0d71d8372ec7dd;hp=66236f4b135da63c0f63615480047dfd301d5fd2;hpb=b783bf06da0040034c506ec529a625ed074b1c01;p=mirror%2Fdsa-puppet.git

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