drop out reports

[mirror/dsa-puppet.git] / modules / bacula / manifests / director.pp

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 5e9550f..4fd0f6d 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -15,8 +15,7 @@ class bacula::director inherits bacula {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                command     => 'service bacula-director reload',
                refreshonly => true,
-        }
-
+       }
 
        file { '/etc/bacula/conf.d':
                ensure  => directory,
@@ -40,7 +39,7 @@ class bacula::director inherits bacula {
        @ferm::rule { 'dsa-bacula-dir':
                domain      => '(ip)',
                description => 'Allow bacula access from localhost',
-               rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
+               rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_ip} localhost) ACCEPT",
        }
 
        file { '/etc/bacula/conf.d/empty.conf':
@@ -63,4 +62,22 @@ class bacula::director inherits bacula {
                group   => bacula,
                require => Package['bacula-console']
        }
+
+       file { '/etc/bacula/scripts/volume-purge-action':
+               mode    => '0555',
+               source  => 'puppet:///modules/bacula/volume-purge-action',
+               ;
+       }
+       file { '/etc/bacula/storages-list.d':
+               ensure  => directory,
+               mode    => '0755',
+               group   => bacula,
+               purge   => true,
+               force   => true,
+               recurse => true,
+               source  => 'puppet:///files/empty/',
+       }
+       file { "/etc/cron.d/puppet-bacula-stuff":
+               content => "@daily root (cat /etc/bacula/storages-list.d/*.storage; echo '$bacula::bacula_filestor_name-catalog') | /etc/bacula/scripts/volume-purge-action\n";
+       }
 }