X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=2d3033b61058eacb1ed5fc7ba7ac504ac4c279c5;hb=14fa2238b4275e88a87ccdc6a5fcb9c0d52a7ede;hp=6e1e11e23ff50cde6cd52c0fd3c1660fee6ae263;hpb=c024f71fb3000053e9501f83642c1ce5253c0869;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 6e1e11e23..2d3033b61 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -10,6 +10,12 @@ class bacula::director inherits bacula {
 		hasstatus => true,
 		require   => Package['bacula-director-pgsql']
 	}
+	systemd::override { 'bacula-director':
+		content => @(EOT)
+			[Unit]
+			After=unbound.service
+			| EOT
+	}
 
 	exec { 'bacula-director reload':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
@@ -63,11 +69,17 @@ class bacula::director inherits bacula {
 		require => Package['bacula-console']
 	}
 
+	package { 'python3-psycopg2': ensure => installed }
 	file { '/etc/bacula/scripts/volume-purge-action':
 		mode    => '0555',
 		source  => 'puppet:///modules/bacula/volume-purge-action',
 		;
 	}
+	file { '/etc/bacula/scripts/volumes-delete-old':
+		mode    => '0555',
+		source  => 'puppet:///modules/bacula/volumes-delete-old',
+		;
+	}
 	file { '/etc/bacula/storages-list.d':
 		ensure  => directory,
 		mode    => '0755',
@@ -77,7 +89,7 @@ class bacula::director inherits bacula {
 		recurse => true,
 		source  => 'puppet:///files/empty/',
 	}
-	file { "/etc/cron.d/dsa-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";
+	file { "/etc/cron.d/puppet-bacula-stuff":
+		source  => 'puppet:///modules/bacula/crontab-director',
 	}
 }