From ead9aaa3dd7ca48012b2b21cc930ee73c8eaa9d3 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 3 Nov 2020 03:15:10 +0100
Subject: Bacula: refactor systemd service files.

Use unit overrides on top of upstream's service files instead of
overriding entire service files.  In particular, upstream uses flag `-P`
so we don't need to use RuntimeDirectory= anymore.
---
 .../files/etc/systemd/system/bacula-sd.service     | 27 ----------------------
 .../system/bacula-sd.service.d/override.conf       | 13 +++++++++++
 roles/bacula-sd/tasks/main.yml                     | 14 +++++++----
 3 files changed, 23 insertions(+), 31 deletions(-)
 delete mode 100644 roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
 create mode 100644 roles/bacula-sd/files/etc/systemd/system/bacula-sd.service.d/override.conf

(limited to 'roles/bacula-sd')

diff --git a/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
deleted file mode 100644
index 61ba01d..0000000
--- a/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
+++ /dev/null
@@ -1,27 +0,0 @@
-[Unit]
-Description=Bacula Storage Daemon service
-After=network.target
-
-[Service]
-Type=simple
-StandardOutput=syslog
-User=bacula
-Group=tape
-ExecStart=/usr/sbin/bacula-sd -f -c /etc/bacula/bacula-sd.conf
-
-# Hardening
-NoNewPrivileges=yes
-PrivateDevices=yes
-ProtectHome=yes
-ProtectSystem=strict
-ReadWriteDirectories=-/var/lib/bacula
-ReadWriteDirectories=/mnt/backup/bacula
-RuntimeDirectory=bacula
-PrivateDevices=yes
-ProtectControlGroups=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-RestrictAddressFamilies=AF_INET AF_INET6
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service.d/override.conf b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service.d/override.conf
new file mode 100644
index 0000000..e4ed970
--- /dev/null
+++ b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service.d/override.conf
@@ -0,0 +1,13 @@
+[Unit]
+# Hardening
+NoNewPrivileges=yes
+PrivateDevices=yes
+ProtectHome=yes
+ProtectSystem=strict
+ReadWriteDirectories=-/var/lib/bacula
+ReadWriteDirectories=/mnt/backup/bacula
+PrivateDevices=yes
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+RestrictAddressFamilies=AF_INET AF_INET6
diff --git a/roles/bacula-sd/tasks/main.yml b/roles/bacula-sd/tasks/main.yml
index 93958a8..f30fe7f 100644
--- a/roles/bacula-sd/tasks/main.yml
+++ b/roles/bacula-sd/tasks/main.yml
@@ -1,7 +1,7 @@
 - name: Install bacula-sd
   apt: pkg=bacula-sd
 
-# Create with:
+# Populate with:
 #   echo $director-dir $(pwgen -sn 64 1) | sudo tee -a /etc/bacula/passwords-sd
 - name: Ensure /etc/bacula/passwords-sd exists
   file: path=/etc/bacula/passwords-sd
@@ -17,9 +17,15 @@
   notify:
     - Restart bacula-sd
 
-- name: Copy bacula-sd.service
-  copy: src=etc/systemd/system/bacula-sd.service
-        dest=/etc/systemd/system/bacula-sd.service
+- name: Create /etc/systemd/system/bacula-sd.service.d
+  file: path=/etc/systemd/system/bacula-sd.service.d
+        state=directory
+        owner=root group=root
+        mode=0755
+
+- name: Copy bacula-sd.service override
+  copy: src=etc/systemd/system/bacula-sd.service.d/override.conf
+        dest=/etc/systemd/system/bacula-sd.service.d/override.conf
         owner=root group=root
         mode=0644
   notify:
-- 
cgit v1.2.3