X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=3597a0c786586f629c3599730f0483285542fb24;hb=7b3a9d7a8a09ece8eecaff50fdc8cd513961dbdb;hp=25ffade0b2fdd2bb2f2939227ec58b6d4ba1db90;hpb=1842c3466ee92bb4f17654fda73f182f8b2fe12a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 25ffade0b..3597a0c78 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -8,6 +8,15 @@
 Director {
   Name = <%= bacula_director_name %>
   Password = "<%= bacula_client_secret %>"
+
+  TLS Enable = yes
+  TLS Require = yes
+  TLS Verify Peer = yes
+  TLS Allowed CN = "clientcerts/<%= bacula_director_address %>"
+  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
@@ -18,7 +27,19 @@ FileDaemon {
   Pid Directory = /var/run/bacula
   Maximum Concurrent Jobs = 20
   FDAddress = <%= fqdn %>
-  Maximum Network Buffer Size = 4194304
+  #Maximum Network Buffer Size = 524288
+
+  TLS Enable = yes
+  TLS Require = yes
+  TLS CA Certificate File = "<%= bacula_ca_path %>"
+  # This is a client certificate, used by the client to connect to the storage daemon
+  TLS Certificate = "<%= bacula_ssl_client_cert %>"
+  TLS Key = "<%= bacula_ssl_client_key %>"
+
+<%- if scope.lookupvar('site::nodeinfo')['hoster']['name'] == "brown" -%>
+  # broken firewall
+  Heartbeat Interval = 300
+<%- end -%>
 }
 
 # Send all messages except skipped files back to Director