| 1 |
commit: 196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6 |
| 2 |
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 09:56:26 2016 +0000 |
| 4 |
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 09:56:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196c2bde |
| 7 |
|
| 8 |
app-admin/logstash-bin: Fix initscript some more #598422 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
app-admin/logstash-bin/files/{logstash.initd2 => logstash.initd3} | 4 ++-- |
| 13 |
.../{logstash-bin-5.0.0.ebuild => logstash-bin-5.0.0-r1.ebuild} | 2 +- |
| 14 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/logstash-bin/files/logstash.initd2 b/app-admin/logstash-bin/files/logstash.initd3 |
| 17 |
similarity index 93% |
| 18 |
rename from app-admin/logstash-bin/files/logstash.initd2 |
| 19 |
rename to app-admin/logstash-bin/files/logstash.initd3 |
| 20 |
index bd0cc91..b7a8eab 100644 |
| 21 |
--- a/app-admin/logstash-bin/files/logstash.initd2 |
| 22 |
+++ b/app-admin/logstash-bin/files/logstash.initd3 |
| 23 |
@@ -15,7 +15,7 @@ LS_OPEN_FILES=${LS_OPEN_FILES:-16384} |
| 24 |
KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0} |
| 25 |
|
| 26 |
command="/opt/logstash/bin/logstash" |
| 27 |
-command_args="--config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}" |
| 28 |
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_FILE} ${LS_OPTS}" |
| 29 |
command_background="true" |
| 30 |
pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"} |
| 31 |
|
| 32 |
@@ -36,7 +36,7 @@ checkconfig() { |
| 33 |
fi |
| 34 |
|
| 35 |
ebegin "Checking your configuration" |
| 36 |
- ${command} ${command_args} --configtest |
| 37 |
+ ${command} ${command_args} --config.test_and_exit |
| 38 |
eend $? "Configuration error. Please fix your configuration files." |
| 39 |
} |
| 40 |
|
| 41 |
|
| 42 |
diff --git a/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild b/app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild |
| 43 |
similarity index 96% |
| 44 |
rename from app-admin/logstash-bin/logstash-bin-5.0.0.ebuild |
| 45 |
rename to app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild |
| 46 |
index be89a3b..669a13e 100644 |
| 47 |
--- a/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild |
| 48 |
+++ b/app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild |
| 49 |
@@ -46,7 +46,7 @@ src_install() { |
| 50 |
newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}" |
| 51 |
|
| 52 |
newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}" |
| 53 |
- newinitd "${FILESDIR}/${MY_PN}.initd2" "${MY_PN}" |
| 54 |
+ newinitd "${FILESDIR}/${MY_PN}.initd3" "${MY_PN}" |
| 55 |
} |
| 56 |
|
| 57 |
pkg_postinst() { |
Archives