[389-commits] wrappers/systemd.group.in wrappers/systemd.template.asan.service.in wrappers/systemd.template.service.in

[William Brown]

wrappers/systemd.group.in                 |    2 +-
 wrappers/systemd.template.asan.service.in |    2 +-
 wrappers/systemd.template.service.in      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 40c2aa6b3a7cadea72de842b8418fec3c4f1eaab
Author: William Brown 
Date:   Fri May 27 12:44:53 2016 +1000

Ticket 48747 - dirsrv service fails to start when nsslapd-listenhost is configured

Thanks for the discussions to
    According to these discussion with Lukas Slebodnik  [1] and
    William Brown  [2], replacing network.service with network.target
    and network-online.target.
    [1] https://fedorahosted.org/389/ticket/48747#comment:6
    [2] https://fedorahosted.org/389/ticket/48747#comment:10

Also, let systemd.group.in have the same After= line as the individual service.

Finally, this changes the dependencies of network.target to network-online.target
    which in some cases may be a stricter requirement.

https://fedorahosted.org/389/ticket/48747

Author: nhosoi, wibrown

Review by: nhosoi (Thanks!)

diff --git a/wrappers/systemd.group.in b/wrappers/systemd.group.in
index 135affc..53abc13 100644
--- a/wrappers/systemd.group.in
+++ b/wrappers/systemd.group.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=@capbrand@ Directory Server
-After=syslog.target network.target ntpd.service
+After=chronyd.service ntpd.service network-online.target syslog.target

[Install]
 WantedBy=multi-user.target
diff --git a/wrappers/systemd.template.asan.service.in b/wrappers/systemd.template.asan.service.in
index af91f16..dd361b4 100644
--- a/wrappers/systemd.template.asan.service.in
+++ b/wrappers/systemd.template.asan.service.in
@@ -15,7 +15,7 @@
 [Unit]
 Description=@capbrand@ Directory Server with ASAN %i.
 PartOf=@systemdgroupname@
-After=chronyd.service network.service
+After=chronyd.service ntpd.service network-online.target syslog.target

[Service]
 Type=notify
diff --git a/wrappers/systemd.template.service.in b/wrappers/systemd.template.service.in
index 3eb0789..a045036 100644
--- a/wrappers/systemd.template.service.in
+++ b/wrappers/systemd.template.service.in
@@ -15,7 +15,7 @@
 [Unit]
 Description=@capbrand@ Directory Server %i.
 PartOf=@systemdgroupname@
-After=chronyd.service network.service
+After=chronyd.service ntpd.service network-online.target syslog.target

[Service]
 Type=notify