From: Michiro Hibari <l05102@shibaura-it.ac.jp>
Date: Mon, 19 Oct 2015 11:22:12 +0000 (+0900)
Subject: Modify systemd unit files.
X-Git-Tag: v3.1.3-rc1~2^2~4
X-Git-Url: http://git.osdn.net/view?p=ultramonkey-l7%2Fultramonkey-l7-v3.git;a=commitdiff_plain;h=1c5cb7f4fd689dcfa4544a3394f6ea258d3ae6e2

Modify systemd unit files.
---

diff --git a/l7directord/systemd/l7directord.service b/l7directord/systemd/l7directord.service
index c9d28fc3..99572718 100644
--- a/l7directord/systemd/l7directord.service
+++ b/l7directord/systemd/l7directord.service
@@ -1,13 +1,12 @@
 [Unit]
 Description=UltraMonkey-L7 healthcheck daemon
-After=syslog.target network.target nss-lookup.service
+After=syslog.target network.target nss-lookup.service l7vsd.service
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/ha.d/conf/l7directord.cf
-ExecStart=/usr/sbin/l7directord start
-ExecReload=/usr/sbin/l7directord reload
-ExecStop=/usr/sbin/l7directord stop
+ExecStart=/usr/sbin/l7directord /etc/ha.d/conf/l7directord.cf start
+ExecReload=/usr/sbin/l7directord /etc/ha.d/conf/l7directord.cf reload
+ExecStop=/usr/sbin/l7directord /etc/ha.d/conf/l7directord.cf stop
 PIDFile=/var/run/l7directord.l7directord.pid
 
 [Install]
diff --git a/l7vsd/systemd/l7vsd.service b/l7vsd/systemd/l7vsd.service
index ae0213f1..97fb3d5c 100644
--- a/l7vsd/systemd/l7vsd.service
+++ b/l7vsd/systemd/l7vsd.service
@@ -1,14 +1,12 @@
 [Unit]
 Description=UltraMonkey-L7 loadbalancing daemon
 After=syslog.target network.target nss-lookup.service
+Before=l7directord.service
 
 [Service]
-Type=oneshot
-# LimitNOFILE=65536
-EnvironmentFile=/etc/l7vs/l7vs.cf
+Type=forking
 ExecStart=/usr/sbin/l7vsd
 ExecStop=/bin/kill $MAINPID
-RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target