1 |
commit: fe2e87cdd9ba78e5ef089edb0f713f80091aa81f |
2 |
Author: Georg Hopp <georg <AT> steffers <DOT> org> |
3 |
AuthorDate: Mon Jun 6 06:09:35 2016 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 6 06:37:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2e87cd |
7 |
|
8 |
app-admin/vault: fix init script command_args, bug 584644 |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
app-admin/vault/files/vault.confd | 2 +- |
13 |
app-admin/vault/files/vault.initd | 2 +- |
14 |
2 files changed, 2 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/app-admin/vault/files/vault.confd b/app-admin/vault/files/vault.confd |
17 |
index 6060958..6263ff0 100644 |
18 |
--- a/app-admin/vault/files/vault.confd |
19 |
+++ b/app-admin/vault/files/vault.confd |
20 |
@@ -4,4 +4,4 @@ |
21 |
# - user (default: vault) |
22 |
|
23 |
# extra arguments for the consul agent |
24 |
-command_args="-config=/etc/consul.d" |
25 |
+command_args="-config=/etc/vault.d" |
26 |
|
27 |
diff --git a/app-admin/vault/files/vault.initd b/app-admin/vault/files/vault.initd |
28 |
index 8d3e2cc..0d473fc 100644 |
29 |
--- a/app-admin/vault/files/vault.initd |
30 |
+++ b/app-admin/vault/files/vault.initd |
31 |
@@ -9,7 +9,7 @@ pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} |
32 |
user=${user:-${SVCNAME}} |
33 |
|
34 |
command="/usr/bin/${SVCNAME}" |
35 |
-command_args="agent -config-dir=/etc/vault.d ${command_args}" |
36 |
+command_args="server ${command_args}" |
37 |
command_background="true" |
38 |
start_stop_daemon_args="--user ${user} --group ${group} \ |
39 |
--stdout /var/log/${SVCNAME}/${SVCNAME}.log \ |