diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2016-10-29 11:56:26 +0200 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2016-10-29 11:56:40 +0200 |
| commit | 196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6 (patch) | |
| tree | c96dc7df60084b0a8ef670851fcfeb496c8d6898 /app-admin | |
| parent | media-libs/jasper: Require C11 support (diff) | |
| download | gentoo-196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6.tar.gz gentoo-196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6.tar.bz2 gentoo-196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6.zip | |
app-admin/logstash-bin: Fix initscript some more #598422
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/logstash-bin/files/logstash.initd3 (renamed from app-admin/logstash-bin/files/logstash.initd2) | 4 | ||||
| -rw-r--r-- | app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild (renamed from app-admin/logstash-bin/logstash-bin-5.0.0.ebuild) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app-admin/logstash-bin/files/logstash.initd2 b/app-admin/logstash-bin/files/logstash.initd3 index bd0cc915dd42..b7a8eabebaa6 100644 --- a/app-admin/logstash-bin/files/logstash.initd2 +++ b/app-admin/logstash-bin/files/logstash.initd3 @@ -15,7 +15,7 @@ LS_OPEN_FILES=${LS_OPEN_FILES:-16384} KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0} command="/opt/logstash/bin/logstash" -command_args="--config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}" +command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_FILE} ${LS_OPTS}" command_background="true" pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"} @@ -36,7 +36,7 @@ checkconfig() { fi ebegin "Checking your configuration" - ${command} ${command_args} --configtest + ${command} ${command_args} --config.test_and_exit eend $? "Configuration error. Please fix your configuration files." } 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 index be89a3b06fc3..669a13e47815 100644 --- a/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild +++ b/app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild @@ -46,7 +46,7 @@ src_install() { newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}" newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}" - newinitd "${FILESDIR}/${MY_PN}.initd2" "${MY_PN}" + newinitd "${FILESDIR}/${MY_PN}.initd3" "${MY_PN}" } pkg_postinst() { |