try again with storeconfigs

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

diff --git a/manifests/site.pp b/manifests/site.pp
index f75f0f87943468e91863492fbaee6ea67825d921..71dc640e6b1ec418b7612ebb5b08620b8558a6c2 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,8 +35,9 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano,bertali,boito] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
                include ganeti2
        }
 
@@ -44,10 +45,6 @@ node default {
                include bacula::director
        }
 
-       if $::hostname in [berlioz, biber, draghi] {
-               include bacula::client
-       }
-
        if $::hostname == 'beethoven' {
                include bacula::storage
        }
@@ -87,7 +84,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
@@ -109,6 +106,10 @@ node default {
                include postgres
        }
 
+       if $::hostname in ['berlioz.debian.org', 'biber.debian.org', 'draghi.debian.org', 'widor.debian.org', 'wolkenstein.debian.org'] {
+               @@bacula::node { $::fqdn: }
+       }
+
        if $::spamd {
                munin::check { 'spamassassin': }
        }