Remove kokkonen from mailout (our MX; RT#3977)

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 1db00d8..8a09872 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,13 +35,18 @@ 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
+               include bacula::director
+       }
+
+       if $::hostname == 'beethoven' {
+               include bacula::storage
        }
 
        if $::kernel == Linux {
@@ -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', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+               @@bacula::node { $::fqdn: }
+       }
+
        if $::spamd {
                munin::check { 'spamassassin': }
        }