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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 38d420bd0..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',
@@ -69,9 +75,9 @@ class bacula::director inherits bacula {
 		source  => 'puppet:///modules/bacula/volume-purge-action',
 		;
 	}
-	file { '/etc/bacula/scripts/get-deleteable-volumes':
+	file { '/etc/bacula/scripts/volumes-delete-old':
 		mode    => '0555',
-		source  => 'puppet:///modules/bacula/get-deleteable-volumes',
+		source  => 'puppet:///modules/bacula/volumes-delete-old',
 		;
 	}
 	file { '/etc/bacula/storages-list.d':
@@ -84,6 +90,6 @@ class bacula::director inherits bacula {
 		source  => 'puppet:///files/empty/',
 	}
 	file { "/etc/cron.d/puppet-bacula-stuff":
-		content => "@daily root chronic /etc/bacula/scripts/volume-purge-action -v\n";
+		source  => 'puppet:///modules/bacula/crontab-director',
 	}
 }