From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31AF213965D for ; Sat, 29 Oct 2016 09:56:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FC24E09C5; Sat, 29 Oct 2016 09:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6719BE09C5 for ; Sat, 29 Oct 2016 09:56:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CB2F34102B for ; Sat, 29 Oct 2016 09:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3E572EF for ; Sat, 29 Oct 2016 09:56:43 +0000 (UTC) From: "Patrick Lauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick Lauer" Message-ID: <1477735000.196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6.patrick@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/, app-admin/logstash-bin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logstash-bin/files/logstash.initd2 app-admin/logstash-bin/files/logstash.initd3 app-admin/logstash-bin/logstash-bin-5.0.0-r1.ebuild app-admin/logstash-bin/logstash-bin-5.0.0.ebuild X-VCS-Directories: app-admin/logstash-bin/files/ app-admin/logstash-bin/ X-VCS-Committer: patrick X-VCS-Committer-Name: Patrick Lauer X-VCS-Revision: 196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6 X-VCS-Branch: master Date: Sat, 29 Oct 2016 09:56:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b28b6056-18dc-4d2f-9217-708374b7a0de X-Archives-Hash: fa32309bd5aa99bacd6f84e3776b16eb commit: 196c2bde7c25fcf057d5e6a3a497cfb2aced8ae6 Author: Patrick Lauer gentoo org> AuthorDate: Sat Oct 29 09:56:26 2016 +0000 Commit: Patrick Lauer gentoo org> CommitDate: Sat Oct 29 09:56:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196c2bde app-admin/logstash-bin: Fix initscript some more #598422 Package-Manager: portage-2.3.2 app-admin/logstash-bin/files/{logstash.initd2 => logstash.initd3} | 4 ++-- .../{logstash-bin-5.0.0.ebuild => logstash-bin-5.0.0-r1.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 similarity index 93% rename from app-admin/logstash-bin/files/logstash.initd2 rename to app-admin/logstash-bin/files/logstash.initd3 index bd0cc91..b7a8eab 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 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 be89a3b..669a13e 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() {