[pkg-bacula-commits] [bacula] 01/01: Fix dependencies of bacula-dir.service

[Sven Hartge]

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

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

commit 07204c94427f1ebebb2b8d136c84bf616cd747b9
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Sep 10 21:36:52 2016 +0200

    Fix dependencies of bacula-dir.service
    
    The init-scripts declares a soft-dependency (Should-Start) on
    mysql and postgres. Do the same for the systemd unit, so that
    the director is always started _after_ the database servers.
    (This does of course not work for a remote database, but there
    is nothing we can do in that case.)
---
 debian/patches/non-forking-systemd-units.patch | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/patches/non-forking-systemd-units.patch b/debian/patches/non-forking-systemd-units.patch
index fb873c1..854fcd9 100644
--- a/debian/patches/non-forking-systemd-units.patch
+++ b/debian/patches/non-forking-systemd-units.patch
@@ -1,11 +1,15 @@
 Description: Change systemd.units to non-forking simple mode
 Author: Sven Hartge <sven at svenhartge.de>
 
-Index: bacula-7.4.2+dfsg/platforms/systemd/bacula-dir.service.in
-===================================================================
---- bacula-7.4.2+dfsg.orig/platforms/systemd/bacula-dir.service.in
-+++ bacula-7.4.2+dfsg/platforms/systemd/bacula-dir.service.in
-@@ -22,13 +22,14 @@ RequiresMountsFor=@working_dir@ @sysconf
+--- a/platforms/systemd/bacula-dir.service.in
++++ b/platforms/systemd/bacula-dir.service.in
+@@ -17,18 +17,19 @@
+ [Unit]
+ Description=Bacula Director Daemon service
+ Requires=network.target
+-After=network.target
++After=network.target postgresql.service mysql.service
+ RequiresMountsFor=@working_dir@ @sysconfdir@ @sbindir@ @piddir@
  
  # From http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
@@ -26,11 +30,9 @@ Index: bacula-7.4.2+dfsg/platforms/systemd/bacula-dir.service.in
  StandardError=syslog
  
  [Install]
-Index: bacula-7.4.2+dfsg/platforms/systemd/bacula-fd.service.in
-===================================================================
---- bacula-7.4.2+dfsg.orig/platforms/systemd/bacula-fd.service.in
-+++ bacula-7.4.2+dfsg/platforms/systemd/bacula-fd.service.in
-@@ -22,11 +22,13 @@ RequiresMountsFor=@working_dir@ @sysconf
+--- a/platforms/systemd/bacula-fd.service.in
++++ b/platforms/systemd/bacula-fd.service.in
+@@ -22,11 +22,13 @@
  
  # from http://www.freedesktop.org/software/systemd/man/systemd.service.html
  [Service]
@@ -49,11 +51,9 @@ Index: bacula-7.4.2+dfsg/platforms/systemd/bacula-fd.service.in
  StandardError=syslog
  
  [Install]
-Index: bacula-7.4.2+dfsg/platforms/systemd/bacula-sd.service.in
-===================================================================
---- bacula-7.4.2+dfsg.orig/platforms/systemd/bacula-sd.service.in
-+++ bacula-7.4.2+dfsg/platforms/systemd/bacula-sd.service.in
-@@ -21,11 +21,13 @@ RequiresMountsFor=@working_dir@ @sysconf
+--- a/platforms/systemd/bacula-sd.service.in
++++ b/platforms/systemd/bacula-sd.service.in
+@@ -21,11 +21,13 @@
  
  # 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