X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=7e923f879f218937196cd71c92d0a2230e8dbf68;hb=932d221f11de1bd4614c669c3f613d4c29213c7a;hp=f3d6f68ec52e8faba0b72697df5d80b88bc6011d;hpb=30856dc322bf75ad5120d6c780007e6b0877b688;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index f3d6f68ec..7e923f879 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -10,13 +10,18 @@ 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',
 		command     => 'service bacula-director reload',
 		refreshonly => true,
-        }
-
+	}
 
 	file { '/etc/bacula/conf.d':
 		ensure  => directory,
@@ -63,4 +68,35 @@ class bacula::director inherits bacula {
 		group   => 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',
+		group   => bacula,
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+	}
+	file { "/etc/cron.d/puppet-bacula-stuff":
+		ensure => absent,
+	}
+	concat::fragment { 'dsa-puppet-stuff--bacula-director':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @(EOF)
+			@daily root chronic /etc/bacula/scripts/volume-purge-action -v
+			@daily root chronic /etc/bacula/scripts/volumes-delete-old -v
+			| EOF
+	}
 }