X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fclient%2Fdirector.pp;h=ec885c28a45c9e59755037aad912ffd39c200580;hb=421d51cedb758b5a27a89b5c458562f9c279cbc3;hp=9c96eb4c85019b36b819f7e5910d0c7833e32e9e;hpb=a3265133b4a390133b3fc306f866433a57fc793e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client/director.pp b/modules/bacula/manifests/client/director.pp
index 9c96eb4c8..ec885c28a 100644
--- a/modules/bacula/manifests/client/director.pp
+++ b/modules/bacula/manifests/client/director.pp
@@ -4,28 +4,32 @@
 #
 # @param director_name     bacula name of the dir instance
 # @param director_address  address of this dir instance that other instances should connect to (dns name)
+# @param messages_name   name of the Messages Resource
 define bacula::client::director(
   String $director_name,
   Stdlib::Host $director_address,
+  String $messages_name,
 ) {
   include bacula::client
 
   $dir_client_secret = hkdf('/etc/puppet/secret', "bacula::director<->fd::${director_address}<->${::fqdn}")
 
   @@bacula::director::client { $bacula::client::client:
-    port_fd       => $bacula::client::port_fd,
-    client        => $bacula::client::client,
-    client_name   => $bacula::client::client_name,
-    client_secret => $dir_client_secret,
-    tag           => "bacula::to-director::${director_address}",
+    tag            => "bacula::to-director::${director_address}",
+    port_fd        => $bacula::client::port_fd,
+    client         => $bacula::client::client,
+    client_name    => $bacula::client::client_name,
+    client_secret  => $dir_client_secret,
+    file_retention => $bacula::client::file_retention,
+    job_retention  => $bacula::client::job_retention,
   }
 
   file {
-    "/etc/bacula/storage-conf.d/Dir_${director_address}.conf":
-      content => template('bacula/storage/sd-per-director.conf.erb'),
+    "/etc/bacula/fd-conf.d/Dir_${director_address}.conf":
+      content => template('bacula/client/fd-per-director.conf.erb'),
       mode    => '0440',
       group   => bacula,
-      notify  => Exec['bacula-sd restart-when-idle'],
+      notify  => Exec['bacula-fd restart-when-idle'],
       ;
   }
 }