add kaufmann, reger, vento and vieuxtemps

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 66236f4..8ef2c6c 100644 (file)
--- 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
                }