X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=d0e0fa599ac89833a9d85b6cdd2417ef8ed8fd70;hb=c49eef3b8c20869a6c3443c8f52a8554008713de;hp=4ffc1ecafb1d9cb24283f92ebb9fda45dd8a7edb;hpb=9fcf4bb136ea38918c495570860360925884f857;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 4ffc1ecaf..d0e0fa599 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']
 	}
+	dsa_systemd::override { 'bacula-director':
+		content => @(EOT)
+			[Unit]
+			After=unbound.service
+			| EOT
+	}
 
 	exec { 'bacula-director reload':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
@@ -36,12 +42,6 @@ class bacula::director inherits bacula {
 		notify  => Exec['bacula-director reload']
 	}
 
-	@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_ip} localhost) ACCEPT",
-	}
-
 	file { '/etc/bacula/conf.d/empty.conf':
 		content => '',
 		mode    => '0440',
@@ -63,9 +63,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 +83,27 @@ class bacula::director inherits bacula {
 		recurse => true,
 		source  => 'puppet:///files/empty/',
 	}
-	file { "/etc/cron.d/debian-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 { '/usr/local/sbin/dsa-bacula-scheduler':
+		source  => 'puppet:///modules/bacula/dsa-bacula-scheduler',
+		mode    => '0555',
+	}
+
+	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
+			*/3 * * * * root sleep $(( $RANDOM \% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
+			| EOF
+	}
+
+	concat { $bacula::bacula_dsa_client_list:
+	}
+	concat::fragment { 'bacula-dsa-client-list::header' :
+		target => $bacula::bacula_dsa_client_list,
+		content  => "",
+		order  => '00',
 	}
+	Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
 }