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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 13e759528..86c903d6d 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -42,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',
@@ -89,12 +83,27 @@ class bacula::director inherits bacula {
 		recurse => true,
 		source  => 'puppet:///files/empty/',
 	}
+	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 |>>
 }