X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=c5478eb2bd138054d83c69c56ac9df4774cf0142;hb=10e736febdb9ccc346a9a29885544db0420cbe35;hp=de60e38a54ec2360f269651fe859eee5fba0e6f4;hpb=750b505fa68a21ad51d2db5454364e6df70e2cec;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index de60e38a5..c5478eb2b 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -23,7 +23,7 @@ Director {
 FileDaemon {
   Name = <%= @bacula_client_name %>
   FDAddresses = {
-    # bacula, on Debian 9 (stretch) does not resolve a single name
+    # bacula, on Debian 9 (stretch), does not resolve a single name
     # to both v4 and v6 addresses.  Se we can't just say
     # ip = { addr = <hostname> }.  Boo.
     <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v4_ldap'] -%>
@@ -34,15 +34,20 @@ FileDaemon {
       port = <%= @bacula_client_port %>
     }
     <%- end -%>
-    <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v6_ldap'] -%>
+    <%- scope.lookupvar('site::nodeinfo')['misc']['v6_ldap'].each do |addr| -%>
     ipv6 = {
-      addr = <%= @fqdn %>
+      addr = <%= addr %>
       port = <%= @bacula_client_port %>
     }
     <%- end -%>
   }
   WorkingDirectory = /var/lib/bacula
+<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>
   Pid Directory = /var/run/bacula
+<%- else -%>
+  Pid Directory = /run/bacula
+  Plugin Directory = /usr/lib/bacula
+<%- end -%>
   Maximum Concurrent Jobs = 20
   #Maximum Network Buffer Size = 524288