X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=2d3033b61058eacb1ed5fc7ba7ac504ac4c279c5;hb=e59e95e12fd531b150a7e989c6401c0a2d38ed86;hp=818cfd6f0a7f3eb5103a0b831f1f7311c9d59252;hpb=76646956da694b823088a432d649824702b18fb1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 818cfd6f0..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,9 +69,15 @@ class bacula::director inherits bacula {
 		require => Package['bacula-console']
 	}
 
-	file { '/etc/bacula/bacula-volume-purge-action':
+	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/bacula-volume-purge-action',
+		source  => 'puppet:///modules/bacula/volumes-delete-old',
 		;
 	}
 	file { '/etc/bacula/storages-list.d':
@@ -77,7 +89,7 @@ class bacula::director inherits bacula {
 		recurse => true,
 		source  => 'puppet:///files/empty/',
 	}
-	file { "/etc/cron.d/tor-bacula-stuff":
-		content => "@daily root (cat /etc/bacula/storages-list.d/*.storage; echo '$bacula::bacula_filestor_name-catalog') | /etc/bacula/bacula-volume-purge-action\n";
+	file { "/etc/cron.d/puppet-bacula-stuff":
+		source  => 'puppet:///modules/bacula/crontab-director',
 	}
 }