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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 5e9550f67..2d3033b61 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,
@@ -40,7 +45,7 @@ class bacula::director inherits bacula {
 	@ferm::rule { 'dsa-bacula-dir':
 		domain      => '(ip)',
 		description => 'Allow bacula access from localhost',
-		rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
+		rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_ip} localhost) ACCEPT",
 	}
 
 	file { '/etc/bacula/conf.d/empty.conf':
@@ -63,4 +68,28 @@ 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":
+		source  => 'puppet:///modules/bacula/crontab-director',
+	}
 }