try again with storeconfigs

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 593be680be55db2c9dfe30b20012faf539f6ee2f..71dc640e6b1ec418b7612ebb5b08620b8558a6c2 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -34,41 +34,46 @@ node default {
        include nagios::client
        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 {
+                       include acpi
+               }
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
 
-       if $::kvmdomain {
-               include acpi
-       }
-
        if $::mta == 'exim4' {
                if getfromhash($site::nodeinfo, 'heavy_exim') {
                        include exim::mx
                } else {
                        include exim
                }
-       } else {
+       } elsif $::mta == 'postfix' {
                include postfix
+       } else {
+               include exim
        }
 
-       include unbound
-
        if $::apache2 {
                include apache2
        }
 
-       if $::rsyncd {
-               include rsyncd-log
-       }
-
        if $::hostname in [ravel,senfl,orff,draghi,diamond] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
@@ -79,7 +84,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
@@ -101,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': }
        }