RT#7513 Get rid of most traces of moszumanska

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

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 7c274c1..9f72e0e 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -9,7 +9,7 @@ class bacula::storage inherits bacula {
                enable    => true,
                hasstatus => true,
        }
-       systemd::override { 'bacula-sd':
+       dsa_systemd::override { 'bacula-sd':
                content => @(EOT)
                        [Service]
                        Group=bacula
@@ -78,8 +78,12 @@ class bacula::storage inherits bacula {
                source  => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
                mode    => '0555',
        }
-       file { "/etc/cron.d/puppet-bacula-storage-stuff":
-               content => "MAILTO=root\n@daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v\n";
+       file { "/etc/cron.d/puppet-bacula-storage-stuff": ensure => absent, }
+       concat::fragment { 'dsa-puppet-stuff--bacula-storage':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               content  => @(EOF)
+                       @daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v
+                       | EOF
        }
 
        Bacula::Storage_per_node<<| |>>