X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=86c903d6d07cdb9390bac58beb136ce6f87d2efe;hb=891ab115f249a1c7e186cca9145989112353a5a0;hp=3770b9181f706e8f195e57d2850e18dc8d3bd515;hpb=a9ff3577d67879bc7e54ae2574b5e92aef5b92d2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 3770b9181..86c903d6d 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',
@@ -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',
@@ -69,6 +69,11 @@ class bacula::director inherits bacula {
 		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',
@@ -78,7 +83,27 @@ class bacula::director inherits bacula {
 		recurse => true,
 		source  => 'puppet:///files/empty/',
 	}
-	file { "/etc/cron.d/puppet-bacula-stuff":
-		content => "@daily root chronic /etc/bacula/scripts/volume-purge-action -v\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 |>>
 }