1 |
commit: 0328499a524ab06a762ddfc3547df030586c7642 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 1 03:22:11 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 1 03:22:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0328499a |
7 |
|
8 |
app-admin/consul: revbump to 0.8.4-r1 for bug 628544 |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.2 |
11 |
|
12 |
...{consul-0.8.4.ebuild => consul-0.8.4-r1.ebuild} | 0 |
13 |
app-admin/consul/files/consul.initd | 28 +++++++--------------- |
14 |
2 files changed, 8 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/app-admin/consul/consul-0.8.4.ebuild b/app-admin/consul/consul-0.8.4-r1.ebuild |
17 |
similarity index 100% |
18 |
rename from app-admin/consul/consul-0.8.4.ebuild |
19 |
rename to app-admin/consul/consul-0.8.4-r1.ebuild |
20 |
|
21 |
diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd |
22 |
index 75836cf53cc..b36db8aef13 100644 |
23 |
--- a/app-admin/consul/files/consul.initd |
24 |
+++ b/app-admin/consul/files/consul.initd |
25 |
@@ -5,35 +5,23 @@ |
26 |
description="consul agent" |
27 |
extra_started_commands="reload" |
28 |
export GOMAXPROCS=${GOMAXPROCS:-2} |
29 |
-group=${group:-${SVCNAME}} |
30 |
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} |
31 |
-user=${user:-${SVCNAME}} |
32 |
- |
33 |
-command="/usr/bin/${SVCNAME}" |
34 |
+group=${group:-${RC_SVCNAME}} |
35 |
+user=${user:-${RC_SVCNAME}} |
36 |
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} |
37 |
+command="/usr/bin/${RC_SVCNAME}" |
38 |
command_args="agent ${command_args:-config-dir=/etc/consul.d}" |
39 |
command_background="true" |
40 |
start_stop_daemon_args="--user ${user} --group ${group} \ |
41 |
- --stdout /var/log/${SVCNAME}/${SVCNAME}.log \ |
42 |
- --stderr /var/log/${SVCNAME}/${SVCNAME}.log" |
43 |
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ |
44 |
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" |
45 |
+stopsig="SIGINT" |
46 |
|
47 |
depend() { |
48 |
need net |
49 |
- after net |
50 |
} |
51 |
|
52 |
reload() { |
53 |
- ebegin "Reloading ${SVCNAME}" |
54 |
+ ebegin "Reloading ${RC_SVCNAME}" |
55 |
${command} reload |
56 |
eend $? |
57 |
} |
58 |
- |
59 |
-start_pre() { |
60 |
- checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}" |
61 |
-} |
62 |
- |
63 |
-stop() { |
64 |
- # SIGINT is required for graceful shutdown of consul agent |
65 |
- ebegin "Stopping ${SVCNAME}" |
66 |
- start-stop-daemon --stop --signal SIGINT --pidfile "${pidfile}" |
67 |
- eend $? |
68 |
-} |