nfs server on glinka

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

diff --git a/manifests/site.pp b/manifests/site.pp
index b9382e2606f90e215466b0c42918bd5faffce49a..9828f6594f6b9c52f57151651f9e920b6a7da5dc 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
        }
 
@@ -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,7 +92,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,spohr,stabile,beach] {
+       if $::hostname in [beethoven,spohr,stabile,beach,glinka] {
                include nfs-server
        }
 
@@ -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
                }