Do backups of dinis

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c43202eaaaa3d47b4c7268285842b3d2c1c86e2e..218452a84f4215fad0a3cf9d15145055d1eb850b 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
@@ -42,10 +43,14 @@ node default {
 
        if $::hostname == 'dinis' {
                include bacula::director
-       }
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
 
-       if $::hostname in [berlioz, biber, draghi, widor] {
-               include bacula::client
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
        }
 
        if $::hostname == 'beethoven' {
@@ -109,6 +114,10 @@ node default {
                include postgres
        }
 
+       if $::hostname in ['berlioz', 'biber', 'diabelli', 'dinis', 'draghi', 'widor', 'wolkenstein'] {
+               @@bacula::node { $::fqdn: }
+       }
+
        if $::spamd {
                munin::check { 'spamassassin': }
        }