try again with storeconfigs

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

diff --git a/manifests/site.pp b/manifests/site.pp
index cadc12ed4d8d2693733f2ed5aca02f7be8590712..71dc640e6b1ec418b7612ebb5b08620b8558a6c2 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,11 +35,20 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
                include ganeti2
        }
 
+       if $::hostname == 'dinis' {
+               include bacula::director
+       }
+
+       if $::hostname == 'beethoven' {
+               include bacula::storage
+       }
+
        if $::kernel == Linux {
                include linux
                if $::kvmdomain {
@@ -75,7 +84,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
@@ -97,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': }
        }