diff options
author | Patrick Lauer <patrick@gentoo.org> | 2016-10-28 21:17:32 +0200 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2016-10-28 21:25:01 +0200 |
commit | dedc7ecc4bee7e1b514ad17d3d545801f8914650 (patch) | |
tree | 6d75ee2bda573c02fe46c8629e0f410ee8ae18b6 /app-admin | |
parent | 3b5db338f9ac6cafefb1369315048a4cb9f8734f (diff) | |
download | gentoo-dedc7ecc4bee7e1b514ad17d3d545801f8914650.tar.gz gentoo-dedc7ecc4bee7e1b514ad17d3d545801f8914650.tar.xz |
app-admin/logstash-bin: Bump to 5.0.0
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/logstash-bin/Manifest | 2 | ||||
-rw-r--r-- | app-admin/logstash-bin/files/logstash.initd2 | 70 | ||||
-rw-r--r-- | app-admin/logstash-bin/logstash-bin-5.0.0.ebuild (renamed from app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild) | 7 |
3 files changed, 74 insertions, 5 deletions
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index 3ff55b83f18..5aaf1cdc50c 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,4 +1,4 @@ DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b18284f43ed9c0089a2efee78b239583 SHA512 cc5d6c04e414daf63c836141df87204e0cbc63f71ee02abb69496e29587d5b0803dd738949de559a597979c9f6c6bf9d11d55f4b084ce875f24fb362f2c9bd3b WHIRLPOOL 71b6d915153d80d9bc81d10454ffd14af4643c61557964d7fd8edf50bf1a5d1c53ce0b09c2aec9b079918df596bbb5b07420b8661572bf7ea659e9703694f07c DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e -DIST logstash-5.0.0-rc1.zip 110823656 SHA256 79d75d5c48b8094951066af4d92ad10e3f77e678d644b2af045bf4367ac8afc9 SHA512 2a8714de7642b89d2f5ec659b194f0949ca65123546389cd1ebdc8c211d24b985d255d61c5f9c84edd231adb61b15f183a9d409574bc9e7f7610444d674d339b WHIRLPOOL 2db57dccb27a0bb91381690da8b79b56868bd5d0deae39c7fbb9749b17f61283c36e49a1d487ed0301ecd347e49ea0b78d52c4e475ac035ed3f25c56372abc19 +DIST logstash-5.0.0.zip 110726123 SHA256 9a8ba13f9d4333fb17f373fc822a0ae5458ef8a37c026b823fc9a66044f8e331 SHA512 928541781d5f6bf16d91184f4863c2ecc3b8f07c190fd332b79f4f790091faf0531063459b96a53a250d986060a8968d9d326285e3195a39a116f0dc2ac1e43d WHIRLPOOL a6447c19d717819fa95b4e35e149215f8e6b270032311a80d56b235a1ee3de3561bd3ce5277ee3bd1fc11126819a0333d9ed068306f360e93788742ba45246d0 DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4 diff --git a/app-admin/logstash-bin/files/logstash.initd2 b/app-admin/logstash-bin/files/logstash.initd2 new file mode 100644 index 00000000000..bd0cc915dd4 --- /dev/null +++ b/app-admin/logstash-bin/files/logstash.initd2 @@ -0,0 +1,70 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 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_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log} +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} + +command="/opt/logstash/bin/logstash" +command_args="--config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${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} --configtest + 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}" + + 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}" +} + +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-5.0.0_rc1.ebuild b/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild index f6418dd0974..be89a3b06fc 100644 --- a/app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild +++ b/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild @@ -7,8 +7,7 @@ EAPI=6 inherit user MY_PN="${PN/-bin}" -MY_PV="${PV/_/-}" -MY_P="${MY_PN}-${MY_PV}" +MY_P="${MY_PN}-${PV}" DESCRIPTION="Tool for managing events and logs" HOMEPAGE="https://www.elastic.co/products/logstash" @@ -16,7 +15,7 @@ SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" RESTRICT="strip" @@ -47,7 +46,7 @@ src_install() { newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}" newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}" - newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}" + newinitd "${FILESDIR}/${MY_PN}.initd2" "${MY_PN}" } pkg_postinst() { |