From 2b86e88b1cdbc434dfef58fa78c86361a3c1a279 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 11 Apr 2019 12:36:38 +0200
Subject: [PATCH] bacula: merge parts of the bacula 9 config

---
 modules/bacula/templates/bacula-dir.conf.erb | 2 +-
 modules/bacula/templates/bacula-fd.conf.erb  | 5 +++++
 modules/bacula/templates/bacula-sd.conf.erb  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index fc9990665..fb52232d7 100644
--- 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 0be7a28d8..c5478eb2b 100644
--- 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 e16588c95..07b839302 100644
--- 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
 
-- 
2.20.1