[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/

[Andrew Savchenko]

commit:     bbdc5412061adf598ed935697441a7d6b05f7614
Author:     Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Mon Feb 13 13:02:21 2017 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 14:58:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdc5412

app-admin/logstash-bin: drop old

Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 app-admin/logstash-bin/Manifest                    |  2 -
 app-admin/logstash-bin/files/agent.conf.sample     |  3 +-
 app-admin/logstash-bin/files/agent.conf.sample2    | 19 ------
 app-admin/logstash-bin/files/logstash.confd        |  2 +-
 app-admin/logstash-bin/files/logstash.confd2       | 37 -----------
 app-admin/logstash-bin/files/logstash.initd        | 21 +++---
 app-admin/logstash-bin/files/logstash.initd4       | 75 ----------------------
 .../logstash-bin/logstash-bin-2.4.0-r3.ebuild      | 65 -------------------
 app-admin/logstash-bin/logstash-bin-5.1.2.ebuild   |  8 +--
 app-admin/logstash-bin/logstash-bin-5.2.0.ebuild   |  6 +-
 app-admin/logstash-bin/metadata.xml                |  3 -
 11 files changed, 21 insertions(+), 220 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index bed8131cc8..c2746956d6 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,2 @@
-DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
 DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
 DIST logstash-5.2.0.zip 100036780 SHA256 875b5dab32a801ad489088fd4da5c2c18bf6292f58e7d17499b83fb9041a6d57 SHA512 30094d4f3f33394b4b6c1083058ab7fe2c33a4fb399f5866d01a472aa851984ec338eca67fbaf004abbd627a9286d8e4d129cdc1dcab627111b0a4d0a78295a7 WHIRLPOOL cee54f5b9c76209be142931755be69f620043beef75d8f6d8a289e2ae5d9c6b7fd5578967eade987fc43f7a219464551f556ca077e2f9d03b9e2960a4ec3d7fe
-DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4

diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index 96781bd332..adf29e1e13 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -13,8 +13,7 @@ output {
     stdout {
         codec => rubydebug
     }
-  
+
     elasticsearch {
-        hosts => localhost
     }
 }

diff --git a/app-admin/logstash-bin/files/agent.conf.sample2 b/app-admin/logstash-bin/files/agent.conf.sample2
deleted file mode 100644
index adf29e1e13..0000000000
--- a/app-admin/logstash-bin/files/agent.conf.sample2
+++ /dev/null
@@ -1,19 +0,0 @@
-input {
-    stdin {
-        type => "stdin"
-    }
-
-    file {
-        type => "syslog"
-        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
-    }
-}
-
-output {
-    stdout {
-        codec => rubydebug
-    }
-
-    elasticsearch {
-    }
-}

diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
index 6d197a2196..dd861d0633 100644
--- a/app-admin/logstash-bin/files/logstash.confd
+++ b/app-admin/logstash-bin/files/logstash.confd
@@ -20,7 +20,7 @@
 #LS_GROUP=logstash
 
 # logstash logging
-#LS_LOG_FILE=/var/log/logstash/logstash.log
+#LS_LOG_DIR=/var/log/logstash
 #LS_USE_GC_LOGGING="true"
 
 # logstash configuration directory

diff --git a/app-admin/logstash-bin/files/logstash.confd2 b/app-admin/logstash-bin/files/logstash.confd2
deleted file mode 100644
index dd861d0633..0000000000
--- a/app-admin/logstash-bin/files/logstash.confd2
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# pidfiles location
-#LS_PIDFILE=/run/logstash/logstash.pid
-
-# user id to be invoked as
-#LS_USER=logstash
-#LS_GROUP=logstash
-
-# logstash logging
-#LS_LOG_DIR=/var/log/logstash
-#LS_USE_GC_LOGGING="true"
-
-# logstash configuration directory
-#LS_CONF_DIR=/etc/logstash/conf.d
-
-# Open file limit
-#LS_OPEN_FILES=16384
-
-# Nice level
-#LS_NICE=19
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-KILL_ON_STOP_TIMEOUT=0

diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
index eee6c09a16..0a0f7ad11b 100644
--- a/app-admin/logstash-bin/files/logstash.initd
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -4,7 +4,7 @@
 
 LS_USER=${LS_USER:-logstash}
 LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
 LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
 LS_HOME=${LS_HOME:-/var/lib/logstash}
 LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
@@ -14,8 +14,10 @@ LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
 LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
 KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
 
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} ${LS_OPTS}"
 command_background="true"
 pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
 
@@ -36,7 +38,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."
 }
 
@@ -52,14 +54,17 @@ start_pre() {
 
 	rc_ulimit="-n ${LS_OPEN_FILES}"
 
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+	local d
+	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
+	done
+
 }
 
 stop() {
 	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
+	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
 		start-stop-daemon --stop \
 			--pidfile=${pidfile} \
 			--retry=TERM/5/KILL/5

diff --git a/app-admin/logstash-bin/files/logstash.initd4 b/app-admin/logstash-bin/files/logstash.initd4
deleted file mode 100644
index 0a0f7ad11b..0000000000
--- a/app-admin/logstash-bin/files/logstash.initd4
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER=${LS_USER:-logstash}
-LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
-LS_NICE=${LS_NICE:-19}
-LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
-LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
-LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
-KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
-
-LS_INSTALL_DIR="/opt/logstash"
-
-command="${LS_INSTALL_DIR}/bin/logstash"
-command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} ${LS_OPTS}"
-command_background="true"
-pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
-
-start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
-	--chdir ${LS_HOME}
-	--nicelevel ${LS_NICE}
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
-	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
-	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-checkconfig() {
-	if [ ! -f ${LS_CONF_DIR}/* ]; then
-		eerror "Please put your configuration in ${LS_CONF_DIR}"
-		exit 1
-	fi
-
-	ebegin "Checking your configuration"
-	${command} ${command_args} --config.test_and_exit
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	rc_ulimit="-n ${LS_OPEN_FILES}"
-
-	local d
-	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
-		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
-		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
-	done
-
-}
-
-stop() {
-	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
-		start-stop-daemon --stop \
-			--pidfile=${pidfile} \
-			--retry=TERM/5/KILL/5
-	else
-		start-stop-daemon --stop \
-			--pidfile=${pidfile}
-	fi
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.4.0-r3.ebuild b/app-admin/logstash-bin/logstash-bin-2.4.0-r3.ebuild
deleted file mode 100644
index 65d79b9585..0000000000
--- a/app-admin/logstash-bin/logstash-bin-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit user
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="!all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz )
-	all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-all-plugins-${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="all-plugins"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
-}
-
-pkg_postinst() {
-	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
-	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
-	ewarn "/etc/conf.d/${MY_PN}"
-	einfo
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
index 0dc59f4961..528bf276b7 100644
--- a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
@@ -16,12 +16,10 @@ SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 RESTRICT="strip"
 QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
 
-DEPEND=""
 RDEPEND="virtual/jre:1.8"
 
 S="${WORKDIR}/${MY_P}"
@@ -36,7 +34,7 @@ src_install() {
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample2" agent.conf
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
@@ -45,8 +43,8 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
-	newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
 }
 
 pkg_postinst() {

diff --git a/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
index 243107ac92..528bf276b7 100644
--- a/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample2" agent.conf
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
@@ -43,8 +43,8 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
-	newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
 }
 
 pkg_postinst() {

diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index 7f21da6f09..86e0bec1b1 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -17,9 +17,6 @@
     <email>proxy-maint@g.o</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <use>
-    <flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
-  </use>
   <upstream>
     <remote-id type="github">elastic/logstash</remote-id>
   </upstream>