X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=9f72e0e0d1065af5d66dd49ea4b3ce45125d271e;hb=37f6673b1fe6ceac1a1cd600d5e39211e9a4d187;hp=7c274c1cef7ff684f98903bdd71c6760ef5fca55;hpb=98804481f258feaeb90769ad4b195c3c26e1fb19;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 7c274c1ce..9f72e0e0d 100644
--- 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<<| |>>