bconsole is only needed on the director

diff --git a/manifests/site.pp b/manifests/site.pp
index 8a09872c7533aa016b42a1ce634db6e018d0e936..6347a8e94e5ad3234a7899b15c96cf4d280f11ab 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,6 +43,14 @@ node default {
 
        if $::hostname == 'dinis' {
                include bacula::director
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
+
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
        }
 
        if $::hostname == 'beethoven' {

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index b3fc7a50c4b73302a83ba9cddb9dc7a0d5a654fb..4ae22ca1200f941f589d5108532a56ff4bbea68e 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -46,4 +46,14 @@ class bacula::director inherits bacula {
 
        Bacula::Node<<| |>>
 
+       package { 'bacula-console':
+               ensure => installed;
+       }
+
+       file { '/etc/bacula/bconsole.conf':
+               content => template('bacula/bconsole.conf.erb'),
+               mode    => '0640',
+               group   => bacula,
+               require => Package['bacula-console']
+       }
 }

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 740ba7f7b5f742441d5f5299cbb2d0f339db1736..ba15e6cec5f48275dbb696b4b427b1e0865ad46b 100644 (file)
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -27,15 +27,4 @@ class bacula {
        $bacula_storage_secret    = hmac('/etc/puppet/secret', "bacula-sd-${bacula_storage_name}")
        $bacula_client_secret     = hmac('/etc/puppet/secret', "bacula-fd-${::fqdn}")
        $bacula_monitor_secret    = hmac('/etc/puppet/secret', "bacula-monitor-${bacula_director_name}")
-
-       package { 'bacula-console':
-               ensure => installed;
-       }
-
-       file { '/etc/bacula/bconsole.conf':
-               content => template('bacula/bconsole.conf.erb'),
-               mode    => '0640',
-               group   => bacula,
-               require => Package['bacula-console']
-       }
 }