X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-fd.conf.erb;h=c5478eb2bd138054d83c69c56ac9df4774cf0142;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=38f13ac7f4b9adeaf375d324751e1928a025530b;hpb=f3f19e45e6bc4fe7486ea117f873c4d341889684;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 38f13ac7f..c5478eb2b 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -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