From 2845af5f76ad3be9c0a1f69ab478ff5a08346a4c Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 9 Dec 2018 18:12:39 +0100
Subject: bacula-*.service: Don't fork in the background.

Inspired from /lib/systemd/system/bacula-fd.service.
---
 roles/bacula-dir/files/etc/systemd/system/bacula-director.service | 5 ++---
 roles/bacula-sd/files/etc/systemd/system/bacula-sd.service        | 5 ++---
 roles/common/files/etc/systemd/system/bacula-fd.service           | 5 ++---
 3 files changed, 6 insertions(+), 9 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 2c09f61..ba943ce 100644
--- a/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
+++ b/roles/bacula-dir/files/etc/systemd/system/bacula-director.service
@@ -3,12 +3,11 @@ Description=Bacula Director service
 After=network.target
 
 [Service]
-Type=forking
-PIDFile=/var/run/bacula/bacula-dir.9101.pid
+Type=simple
 StandardOutput=syslog
 User=bacula
 Group=bacula
-ExecStart=/usr/sbin/bacula-dir -c /etc/bacula/bacula-dir.conf
+ExecStart=/usr/sbin/bacula-dir -f -c /etc/bacula/bacula-dir.conf
 
 # Hardening
 NoNewPrivileges=yes
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 0e27af3..0117d3d 100644
--- a/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
+++ b/roles/bacula-sd/files/etc/systemd/system/bacula-sd.service
@@ -3,12 +3,11 @@ Description=Bacula Storage Daemon service
 After=network.target
 
 [Service]
-Type=forking
-PIDFile=/var/run/bacula/bacula-sd.9103.pid
+Type=simple
 StandardOutput=syslog
 User=bacula
 Group=tape
-ExecStart=/usr/sbin/bacula-sd -c /etc/bacula/bacula-sd.conf
+ExecStart=/usr/sbin/bacula-sd -f -c /etc/bacula/bacula-sd.conf
 
 # Hardening
 NoNewPrivileges=yes
diff --git a/roles/common/files/etc/systemd/system/bacula-fd.service b/roles/common/files/etc/systemd/system/bacula-fd.service
index 68934f1..192ea1b 100644
--- a/roles/common/files/etc/systemd/system/bacula-fd.service
+++ b/roles/common/files/etc/systemd/system/bacula-fd.service
@@ -3,10 +3,9 @@ Description=Bacula File Daemon service
 After=network.target
 
 [Service]
-Type=forking
-PIDFile=/var/run/bacula/bacula-fd.9102.pid
+Type=simple
 StandardOutput=syslog
-ExecStart=/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf
+ExecStart=/usr/sbin/bacula-fd -f -c /etc/bacula/bacula-fd.conf
 
 # Hardening
 NoNewPrivileges=yes
-- 
cgit v1.2.3