bacula: merge parts of the bacula 9 config

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index fc99906..fb52232 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -14,7 +14,7 @@ Director {
   Description = <%= @hostname %> - <%= @domain %> Bacula Director
   QueryFile = "/etc/bacula/scripts/query.sql"
   WorkingDirectory = "/var/lib/bacula"
-  PidDirectory = "/var/run/bacula"
+  PidDirectory = "/run/bacula"
   Maximum Concurrent Jobs = 20
   Password = "<%= @bacula_director_secret %>"
   Messages = Daemon

diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 0be7a28..c5478eb 100644 (file)
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -42,7 +42,12 @@ FileDaemon {
     <%- 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
 

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index e16588c..07b8393 100644 (file)
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -26,7 +26,8 @@ Storage {
     <%- end -%>
   }
   WorkingDirectory = "/var/lib/bacula"
-  Pid Directory = "/var/run/bacula"
+  Pid Directory = "/run/bacula"
+  Plugin Directory = "/usr/lib/bacula"
   Maximum Concurrent Jobs = 21
   Heartbeat Interval = 60