[pkg-bacula-commits] [bacula] 01/01: Remove duplicate configuration check during reload

[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 fd2130a76aa7aa0be918687b33caaaa5b6a5420f
Author: Sven Hartge <sven at svenhartge.de>
Date:   Tue Aug 15 13:22:34 2017 +0200

    Remove duplicate configuration check during reload
---
 debian/patches/non-forking-systemd-units.patch | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/patches/non-forking-systemd-units.patch b/debian/patches/non-forking-systemd-units.patch
index 046a489..f3fc89d 100644
--- a/debian/patches/non-forking-systemd-units.patch
+++ b/debian/patches/non-forking-systemd-units.patch
@@ -1,9 +1,11 @@
 Description: Change systemd.units to non-forking simple mode
 Author: Sven Hartge <sven at svenhartge.de>
 
---- a/platforms/systemd/bacula-dir.service.in
-+++ b/platforms/systemd/bacula-dir.service.in
-@@ -17,18 +17,22 @@
+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 @@
  [Unit]
  Description=Bacula Director Daemon service
  Requires=network.target
@@ -18,6 +20,7 @@ Author: Sven Hartge <sven at svenhartge.de>
 -Group=@dir_group@
 -ExecStart=@sbindir@/bacula-dir -c @sysconfdir@/bacula-dir.conf
 -PIDFile=@piddir@/bacula-dir. at dir_port@.pid
+-ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
 +Type=simple
 +User=bacula
 +Group=bacula
@@ -26,15 +29,16 @@ Author: Sven Hartge <sven at svenhartge.de>
 +ExecStartPre=@sbindir@/bacula-dir -t -c $CONFIG
 +ExecStart=@sbindir@/bacula-dir -f -c $CONFIG
 +ExecReload=@sbindir@/bacula-dir -t -c $CONFIG
- ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
  ExecReload=/bin/kill -HUP $MAINPID
 +SuccessExitStatus=15
  StandardError=syslog
  
  [Install]
---- a/platforms/systemd/bacula-fd.service.in
-+++ b/platforms/systemd/bacula-fd.service.in
-@@ -22,11 +22,15 @@
+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
  
  # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
@@ -55,9 +59,11 @@ Author: Sven Hartge <sven at svenhartge.de>
  StandardError=syslog
  
  [Install]
---- a/platforms/systemd/bacula-sd.service.in
-+++ b/platforms/systemd/bacula-sd.service.in
-@@ -21,11 +21,15 @@
+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
  
  # 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