Adapt upstream systemd units to Debian packaging

Gbp-Pq: Topic debian
Gbp-Pq: Name customize-systemd-units

3 files changed, 39 insertions, 15 deletions

diff --git a/platforms/systemd/bacula-dir.service.in b/platforms/systemd/bacula-dir.service.in
index e8d39b0a..f75c54df 100644
--- a/platforms/systemd/bacula-dir.service.in
+++ b/platforms/systemd/bacula-dir.service.in
@@ -3,32 +3,39 @@
 # Copyright (C) 2000-2017 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
-# /lib/systemd/system/bacula-dir.service
+# /lib/systemd/system/bacula-director.service
 #
 # Description:
-#    Used to start/stop/reload the bacula director daemon service (bacula-dir)
+#    Used to start/stop/reload the bacula director daemon service (bacula-director)
 #
-#    enable : systemctl enable bacula-dir
-#    start : systemctl start bacula-dir
+#    enable : systemctl enable bacula-director
+#    start : systemctl start bacula-director
 #
 #
 
 # From http://www.freedesktop.org/software/systemd/man/systemd.unit.html
 [Unit]
 Description=Bacula Director Daemon service
+Documentation=man:bacula-dir(8)
 Requires=network.target
-After=network.target multi-user.target
+After=network.target multi-user.target postgresql.service mysql.service
 RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@
 
 # From http://www.freedesktop.org/software/systemd/man/systemd.service.html
 [Service]
 Type=simple
-User=@dir_user@
-Group=@dir_group@
-ExecStart=@sbindir@/bacula-dir -fP -c @sysconfdir@/bacula-dir.conf
-ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
+User=bacula
+Group=bacula
+Environment="CONFIG=/etc/bacula/bacula-dir.conf"
+EnvironmentFile=-/etc/default/bacula-dir
+ExecStartPre=@sbindir@/bacula-dir -t -c $CONFIG
+ExecStart=@sbindir@/bacula-dir -fP -c $CONFIG
+ExecReload=@sbindir@/bacula-dir -t -c $CONFIG
 ExecReload=/bin/kill -HUP $MAINPID
 SuccessExitStatus=15
+Restart=on-failure
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target
+Alias=bacula-dir.service
diff --git a/platforms/systemd/bacula-fd.service.in b/platforms/systemd/bacula-fd.service.in
index 48ca58e5..29cd2f15 100644
--- a/platforms/systemd/bacula-fd.service.in
+++ b/platforms/systemd/bacula-fd.service.in
@@ -16,6 +16,7 @@
 # from http://www.freedesktop.org/software/systemd/man/systemd.unit.html
 [Unit]
 Description=Bacula File Daemon service
+Documentation=man:bacula-fd(8)
 Requires=network.target
 After=network.target
 RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@
@@ -23,10 +24,17 @@ RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@
 # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
 [Service]
 Type=simple
-User=@fd_user@
-Group=@fd_group@
-ExecStart=@sbindir@/bacula-fd -fP -c @sysconfdir@/bacula-fd.conf
+User=root
+Group=root
+Environment="CONFIG=/etc/bacula/bacula-fd.conf"
+EnvironmentFile=-/etc/default/bacula-fd
+ExecStartPre=@sbindir@/bacula-fd -t -c $CONFIG
+ExecStart=@sbindir@/bacula-fd -fP -c $CONFIG
+ExecReload=@sbindir@/bacula-fd -t -c $CONFIG
+ExecReload=/bin/kill -HUP $MAINPID
 SuccessExitStatus=15
+Restart=on-failure
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target
diff --git a/platforms/systemd/bacula-sd.service.in b/platforms/systemd/bacula-sd.service.in
index ba15a664..47259caa 100644
--- a/platforms/systemd/bacula-sd.service.in
+++ b/platforms/systemd/bacula-sd.service.in
@@ -15,6 +15,7 @@
 # from http://www.freedesktop.org/software/systemd/man/systemd.unit.html
 [Unit]
 Description=Bacula Storage Daemon service
+Documentation=man:bacula-sd(8)
 Requires=network.target
 After=network.target
 RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@
@@ -22,11 +23,19 @@ RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@
 # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
 [Service]
 Type=simple
-User=@sd_user@
-Group=@sd_group@
-ExecStart=@sbindir@/bacula-sd -fP -c @sysconfdir@/bacula-sd.conf
+User=bacula
+Group=tape
+SupplementaryGroups=bacula
+Environment="CONFIG=/etc/bacula/bacula-sd.conf"
+EnvironmentFile=-/etc/default/bacula-sd
+ExecStartPre=@sbindir@/bacula-sd -t -c $CONFIG
+ExecStart=@sbindir@/bacula-sd -fP -c $CONFIG
+ExecReload=@sbindir@/bacula-sd -t -c $CONFIG
+ExecReload=/bin/kill -HUP $MAINPID
 SuccessExitStatus=15
 LimitMEMLOCK=infinity
+Restart=on-failure
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target