From 6450b2f48b57d92db102277448879a3a7c99d97b Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 26 May 2020 21:12:38 +0200
Subject: bacula-{dir,sd}: Upgrade role to Debian Buster.

---
 roles/bacula-dir/files/etc/systemd/system/bacula-director.service | 2 +-
 roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2          | 4 ++--
 roles/bacula-sd/files/etc/systemd/system/bacula-sd.service        | 2 +-
 roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/bacula-dir/files/etc/systemd/system/bacula-director.service b/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
index 4873689..8b2f5ff 100644
--- a/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
+++ b/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
@@ -16,7 +16,7 @@ ProtectHome=yes
 ProtectSystem=strict
 ReadWriteDirectories=-/var/lib/bacula
 ReadWriteDirectories=-/var/log/bacula
-ReadWriteDirectories=-/var/run/bacula
+RuntimeDirectory=bacula
 PrivateDevices=yes
 ProtectControlGroups=yes
 ProtectKernelModules=yes
diff --git a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
index efaf06a..2042b57 100644
--- a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
+++ b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
@@ -1,6 +1,6 @@
 #
 # Default Bacula Director Configuration file
-# For Bacula release 5.2.6 (21 February 2012) -- debian jessie/sid
+# For Bacula release 9.4.2 (04 February 2019) -- debian buster/sid
 #
 
 Director {  # define myself
@@ -8,7 +8,7 @@ Director {  # define myself
   @|"sed -n '/^bconsole\\s/ {s//Password = /p; q}' /etc/bacula/passwords-dir"
   Messages = Daemon
   Working Directory = /var/lib/bacula
-  Pid Directory = /var/run/bacula
+  Pid Directory = /run/bacula
   QueryFile = "/etc/bacula/scripts/query.sql"
   Maximum Concurrent Jobs = 1
   DirAddress = 127.0.0.1
diff --git a/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
index 30fa562..61ba01d 100644
--- a/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
+++ b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
@@ -15,8 +15,8 @@ PrivateDevices=yes
 ProtectHome=yes
 ProtectSystem=strict
 ReadWriteDirectories=-/var/lib/bacula
-ReadWriteDirectories=-/var/run/bacula
 ReadWriteDirectories=/mnt/backup/bacula
+RuntimeDirectory=bacula
 PrivateDevices=yes
 ProtectControlGroups=yes
 ProtectKernelModules=yes
diff --git a/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2 b/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2
index 3cbf7fe..a898e0d 100644
--- a/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2
+++ b/roles/bacula-sd/templates/etc/bacula/bacula-sd.conf.j2
@@ -1,7 +1,7 @@
 #
 # Default Bacula Storage Daemon Configuration file
 #
-#  For Bacula release 5.2.6 (21 February 2012) -- debian jessie/sid
+#  For Bacula release 9.4.2 (04 February 2019) -- debian buster/sid
 #
 # You may need to change the name of your tape drive
 #   on the "Archive Device" directive in the Device
@@ -13,7 +13,7 @@
 Storage {  # define myself
   Name = {{ inventory_hostname_short }}-sd
   Working Directory = /var/lib/bacula
-  Pid Directory = /var/run/bacula
+  Pid Directory = /run/bacula
   Maximum Concurrent Jobs = 20
   SDAddress = {{ ipsec[inventory_hostname_short] }}
   SDPort = 9103
-- 
cgit v1.2.3