app-admin/logstash-bin: Fix initscript some more #598422

Package-Manager: portage-2.3.2

diff --git a/app-admin/logstash-bin/files/logstash.initd2 b/app-admin/logstash-bin/files/logstash.initd3
similarity index 93%
rename from app-admin/logstash-bin/files/logstash.initd2
rename to app-admin/logstash-bin/files/logstash.initd3
index bd0cc915dd4213ad982d36367f91863960eb51c6..b7a8eabebaa6f081e29a6854fced0918a4c02da9 100644 (file)
--- 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
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-5.0.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild
index be89a3b06fc39c571ea64fa64da5c80c5f5de1a5..669a13e47815239662d403f54bd5fdffb16e5ccf 100644 (file)
--- 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() {