From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 25 Dec 2017 11:12:31 +0000 (+0100)
Subject: Move crontab bacula-storage into dsa-puppet-stuff
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=72ab956e88494ac43ed4e319031cac0286c594e1;hp=932d221f11de1bd4614c669c3f613d4c29213c7a;p=mirror%2Fdsa-puppet.git

Move crontab bacula-storage into dsa-puppet-stuff
---

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 7c274c1ce..d926e4e06 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -79,7 +79,13 @@ class bacula::storage inherits bacula {
 		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";
+		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<<| |>>