X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=1e538bf17cd1f158cf00bc6d731cd5e55d6a6832;hb=3661675fcab6a1dab09910456c98f19aaa50b395;hp=941c97b176c19840473c42f88fd4397970002818;hpb=497c4b778fdae1f95b8800dccb87de4541c7c022;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 941c97b17..1e538bf17 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -9,6 +9,13 @@ class bacula::storage inherits bacula {
 		enable    => true,
 		hasstatus => true,
 	}
+	systemd::override { 'bacula-sd':
+		content => @(EOT)
+			[Service]
+			Group=bacula
+			SupplementaryGroups=ssl-cert
+			| EOT
+	}
 
 	exec { 'bacula-sd restart-when-idle':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
@@ -66,12 +73,17 @@ class bacula::storage inherits bacula {
 		;
 	}
 
+	package { 'python3-psycopg2': ensure => installed }
 	file { '/usr/local/bin/bacula-unlink-removed-volumes':
 		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<<| |>>