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 775c6a1..8a09872 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,7 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
        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, widor, wolkenstein] {
-               include bacula::client
-       }
-
        if $::hostname == 'beethoven' {
                include bacula::storage
        }
@@ -109,6 +106,10 @@ node default {
                include postgres
        }
 
+       if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+               @@bacula::node { $::fqdn: }
+       }
+
        if $::spamd {
                munin::check { 'spamassassin': }
        }