X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=5e07c9fe6ffffac3ab8f7c9c60508653bb2a98d5;hb=d65d563ddf3dbd57e4c80905a442279d11e7dd1a;hp=16a89e088ccdbef9982aa18be281ad0a0a558aae;hpb=e272b442942830a6eed50748eb63aa3b6318ca2b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 16a89e088..5e07c9fe6 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -4,24 +4,9 @@
 ##
 #  For Bacula release 5.0.1 (24 February 2010) -- debian 5.0.4
 
-# List Directors who are permitted to contact this File daemon
-Director {
-  Name = <%= @bacula_director_name %>
-  Password = "<%= @bacula_client_secret %>"
-
-  TLS Enable = yes
-  TLS Require = yes
-  TLS Verify Peer = yes
-  TLS Allowed CN = "clientcerts/<%= @director_server %>"
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
-  # This is a server certificate, used for incoming director connections.
-  TLS Certificate = "<%= @bacula_ssl_server_cert %>"
-  TLS Key = "<%= @bacula_ssl_server_key %>"
-}
-
 # "Global" File daemon configuration specifications
 FileDaemon {
-  Name = <%= @bacula_client_name %>
+  Name = <%= @client_name %>
   FDAddresses = {
     # bacula, on Debian 9 (stretch), does not resolve a single name
     # to both v4 and v6 addresses.  Se we can't just say
@@ -63,8 +48,4 @@ FileDaemon {
 <%- end -%>
 }
 
-# Send all messages except skipped files back to Director
-Messages {
-  Name = Standard
-  director = <%= @bacula_director_name %> = all, !skipped, !restored
-}
+@|"sh -c 'for f in /etc/bacula/fd-conf.d/*.conf ; do echo @${f} ; done'"