Split the director config coming from each node in two parts: one that comes from...

[mirror/dsa-puppet.git] / modules / bacula / templates / bacula-fd.conf.erb

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 2952195..16a89e0 100644 (file)
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -12,7 +12,7 @@ Director {
   TLS Enable = yes
   TLS Require = yes
   TLS Verify Peer = yes
-  TLS Allowed CN = "clientcerts/<%= @bacula_director_address %>"
+  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 %>"
@@ -31,13 +31,13 @@ FileDaemon {
       # use the hostname rather than the IP address from LDAP,
       # as /etc/hosts might have a better answer in case of natted hosts.
       addr = <%= @fqdn %>
-      port = <%= @bacula_client_port %>
+      port = <%= @port_fd %>
     }
     <%- end -%>
     <%- scope.lookupvar('deprecated::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
     ipv6 = {
       addr = <%= addr %>
-      port = <%= @bacula_client_port %>
+      port = <%= @port_fd %>
     }
     <%- end -%>
   }
@@ -49,7 +49,6 @@ FileDaemon {
   Plugin Directory = /usr/lib/bacula
 <%- end -%>
   Maximum Concurrent Jobs = 20
-  #Maximum Network Buffer Size = 524288
 
   TLS Enable = yes
   TLS Require = yes