[pkg-bacula-commits] [bacula] 01/01: Improve systemd units

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch master
in repository bacula.

commit 662e01eca29a12d65c6efbd4a6ad7b437a4ba7cf
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sun Oct 22 15:06:13 2017 +0200

    Improve systemd units
    
    - Correct path in comments
    - Restart daemon after 60 seconds if it fails
      This is helpful if, for example, the SQL daemon is restarted at
      the same time and not ready when bacula-director wants to connect
---
 debian/patches/non-forking-systemd-units.patch | 44 +++++++++++++++++---------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/debian/patches/non-forking-systemd-units.patch b/debian/patches/non-forking-systemd-units.patch
index f3fc89d..b9ddedc 100644
--- a/debian/patches/non-forking-systemd-units.patch
+++ b/debian/patches/non-forking-systemd-units.patch
@@ -1,11 +1,26 @@
 Description: Change systemd.units to non-forking simple mode
 Author: Sven Hartge <sven at svenhartge.de>
 
-Index: bacula/platforms/systemd/bacula-dir.service.in
-===================================================================
---- bacula.orig/platforms/systemd/bacula-dir.service.in
-+++ bacula/platforms/systemd/bacula-dir.service.in
-@@ -17,18 +17,21 @@
+--- a/platforms/systemd/bacula-dir.service.in
++++ b/platforms/systemd/bacula-dir.service.in
+@@ -3,13 +3,13 @@
+ # Copyright (C) 2000-2016 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)
+ #
+-#    enable : systemctl enable bacula-dir
+-#    start : systemctl start bacula-dir
++#    enable : systemctl enable bacula-director
++#    start : systemctl start bacula-director
+ #
+ #
+ 
+@@ -17,19 +17,24 @@
  [Unit]
  Description=Bacula Director Daemon service
  Requires=network.target
@@ -32,13 +47,14 @@ Index: bacula/platforms/systemd/bacula-dir.service.in
  ExecReload=/bin/kill -HUP $MAINPID
 +SuccessExitStatus=15
  StandardError=syslog
++Restart=on-failure
++RestartSec=60
  
  [Install]
-Index: bacula/platforms/systemd/bacula-fd.service.in
-===================================================================
---- bacula.orig/platforms/systemd/bacula-fd.service.in
-+++ bacula/platforms/systemd/bacula-fd.service.in
-@@ -22,11 +22,15 @@ RequiresMountsFor=@working_dir@ @sysconf
+ WantedBy=multi-user.target
+--- a/platforms/systemd/bacula-fd.service.in
++++ b/platforms/systemd/bacula-fd.service.in
+@@ -22,11 +22,15 @@
  
  # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
@@ -59,11 +75,9 @@ Index: bacula/platforms/systemd/bacula-fd.service.in
  StandardError=syslog
  
  [Install]
-Index: bacula/platforms/systemd/bacula-sd.service.in
-===================================================================
---- bacula.orig/platforms/systemd/bacula-sd.service.in
-+++ bacula/platforms/systemd/bacula-sd.service.in
-@@ -21,11 +21,15 @@ RequiresMountsFor=@working_dir@ @sysconf
+--- a/platforms/systemd/bacula-sd.service.in
++++ b/platforms/systemd/bacula-sd.service.in
+@@ -21,11 +21,15 @@
  
  # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git