commit: 5a4564496604d80cdffd7eccdb00e80ded5fe840 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Mon Apr 11 10:24:55 2016 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Tue Apr 12 06:07:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a456449
app-admin/logstash-bin: bump to 2.2.4/2.3.1, remove old Fixes bugs #578954 and #578978 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1233 Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org> app-admin/logstash-bin/Manifest | 8 +-- app-admin/logstash-bin/files/logstash.confd | 42 ++++++++++-- app-admin/logstash-bin/files/logstash.confd-r1 | 37 ----------- app-admin/logstash-bin/files/logstash.initd | 75 ++++++++++++++-------- app-admin/logstash-bin/files/logstash.initd-r1 | 57 ---------------- app-admin/logstash-bin/files/logstash.initd-r2 | 65 ------------------- app-admin/logstash-bin/files/logstash.logrotate-r2 | 6 -- app-admin/logstash-bin/logstash-bin-2.1.3.ebuild | 52 --------------- app-admin/logstash-bin/logstash-bin-2.2.2.ebuild | 52 --------------- ...n-2.2.2-r2.ebuild => logstash-bin-2.2.4.ebuild} | 14 ++-- .../logstash-bin/logstash-bin-2.3.0-r1.ebuild | 60 ----------------- ...-bin-2.2.0.ebuild => logstash-bin-2.3.1.ebuild} | 19 ++++-- 12 files changed, 109 insertions(+), 378 deletions(-) diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index 4a66b10..2c467a3 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,5 +1,3 @@ -DIST logstash-2.1.3.tar.gz 74433726 SHA256 c592ea6c63a64f44a08a4b86b8ce6e72847ffdf0cd207d1571dcfda899f7134f SHA512 76a25c4ac49b2d8d10ea13e60a249dad95b661f54310ad5ba7abf169065429342323e97d0bd1954542db31627d27762aabd0087186e3176a27066afc9b1e185c WHIRLPOOL 7da3f23e3fa0c09c7de0098dc09c5019e7bd5e7b3bf67b6df7b9d5d5ee06e6f2cb88c49b3865931cbe58342b28dd6035ea7da6889ff55d00ab6b87612a7ceff2 -DIST logstash-2.2.0.tar.gz 74440588 SHA256 aee2437f45c726ec354f0bf9634b3638428d48bef32beb412f827eb2cc736f78 SHA512 8a167971731bf0d0a7eddb023c57c66fa8ebeb0842756711795117bdb988018040ea50848c1f6e06ba748d76b723a39f758e275778270cf92acebb3284263ce0 WHIRLPOOL b07eba50168bd9ee9e7b55e8b9fd181353188db4b4c8e4dedc289cd8c8d4fae4c10650a8d968c06cd90e132f90adbc0805c077f1d891ef968e5ae02bf240dc27 -DIST logstash-2.2.2.tar.gz 74452781 SHA256 f0a29ec8fd327e42f3023bd6bf85a00ac20617bfc214df59c765453977398312 SHA512 bab0463f6d4aeccfac04007d318b8cf70d56c803dfaa7948fb7dc1ca29bb91ccc3b1c5b705bede585e4adb98e63b3515bbabfc1206378e3b53ead78cf08c3da4 WHIRLPOOL 92122b7687b7230ad9d9415d9bbcca737cabb46f512d2a86f4401205a3cdf0f31bee8bf6e0a42066a54234474b490c008ad2084f8ff5a5fc5af87532842de39a -DIST logstash-2.3.0.tar.gz 73593126 SHA256 d802803ac6dc7e9215b19764dd8fbaa74c75fa1d8bf387508fb0d0d8d36b0241 SHA512 1a8aa6ebe43b80c6cfe44e5ac8233b451c0cbd1bf4636155726b115992a0a2b046926a5fa887d2dc33f7611e9a295cdd4a5875c875f289400ea7f93413459928 WHIRLPOOL 1d3e54ae4775459f35bf1d0fe51e634c27b5b0488e9e6fe9129d38956bd5296b3b78bea77c8a72b810fb11ea9a13214efad900398cd9c76d1e95d6ced79cd043 -DIST logstash-all-plugins-2.2.0.tar.gz 129473672 SHA256 966b5408e66af003f96084bf6f8764855c00530db8b326513d795541a62e4d41 SHA512 0725275e312f9a936d750959ccc388bac0df91ff7dd1a74d501cfdfe20006a0a5008d0877012ad80b5caece3f64bdc86b79ffb20e2f07c4a8cd5bdd2daf8d1b2 WHIRLPOOL 3cfaf4693a0b7ef0343a973de344b063ad0d1928bf9316cc893ed88de9a7ef209a206d0cb881582c2213de9409874a959c44d874af82a5bad6468943fe4297c8 +DIST logstash-2.2.4.tar.gz 75221745 SHA256 0d7fa078eb93b1eecea2845b1404b0f05b438cb3ecc9999316477980ef945492 SHA512 fe8aaea2d2d44f3c1b178a72cf760a7bb345110e51905ea2cfe0a493051c53218f473db7bbf6dbb88c36b92c4aaa28e8edf05c91711207249b4a0f01b6b60055 WHIRLPOOL 8c37e72a581a1594706eb14c30c56fc9b6d8e78ca7e8fee63885983c10560cb6250e5a82b8e233d3abb3d234575252d2676cf5429e6589fa1981aefb50c7cfdd +DIST logstash-2.3.1.tar.gz 75222794 SHA256 d4bab55c6d59846995fa88ba297387cfa31d7e7e8b21a35441178b7a44cfff45 SHA512 54b03fedd77b62f2e71b39059435fe38c16780b629b35fe25a7e2ef8c51864c6b19978481c740be181cbc83af78b23aea087e06068af2b5f436b0ad28985bce4 WHIRLPOOL e2351ab481a83ab894248715337785562dc392eae22ffe6073d2218dc33c4b62f4499e7b31a4d4301eb85dbe23ac7fd3596a2752d050b348ad46ad17ec62c544 +DIST logstash-all-plugins-2.3.1.tar.gz 130666101 SHA256 ecdede3d5bd14f8a146abcdc3860467382467a31581bdcc3cd8e417b306822fe SHA512 0848b5dc04116185c9a0069347279035f12b2d79ea4e45a4f91fdbe68d06559e1eea68579e8e0266bcf4f015a91c51571ffb2e52538cd704666cf7e1653800c7 WHIRLPOOL 0cc0297e2c7b0c595862dd0f11bf0d74fb0da6cecdbc79ec8580c2fda63a0441133736bef48657baa2e620d045c6b6b48dbb8a78c58ffdf7ff96a387acaca5e8 diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd index cb68395..6d197a2 100644 --- a/app-admin/logstash-bin/files/logstash.confd +++ b/app-admin/logstash-bin/files/logstash.confd @@ -1,9 +1,37 @@ -#LS_USER="root" -#LS_GROUP="root" -#LS_CONFDIR="/etc/logstash/conf.d" -#LS_LOGFILE="/var/log/logstash/logstash.log" -#LS_PIDFILE="/run/logstash/logstash.pid" +############################### +# 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_NICE=19 +#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_FILE=/var/log/logstash/logstash.log +#LS_USE_GC_LOGGING="true" + +# logstash configuration directory +#LS_CONF_DIR=/etc/logstash/conf.d + +# Open file limit #LS_OPEN_FILES=16384 -#LS_OPTS="" + +# 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.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1 deleted file mode 100644 index 6d197a2..0000000 --- a/app-admin/logstash-bin/files/logstash.confd-r1 +++ /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_FILE=/var/log/logstash/logstash.log -#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 0a844b9..a81e010 100644 --- a/app-admin/logstash-bin/files/logstash.initd +++ b/app-admin/logstash-bin/files/logstash.initd @@ -1,49 +1,70 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -LS_USER="${LS_USER:-root}" -LS_GROUP="${LS_GROUP:-root}" -LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}" -LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}" -LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}" -LS_NICE="${LS_NICE:-19}" -LS_OPEN_FILES="${LS_OPEN_FILES:-16384}" -LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}" +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="agent --config ${LS_CONFDIR}/{*}.conf --log ${LS_LOGFILE} ${LS_OPTS}" -extra_commands="checkconfig" +command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}" command_background="true" -start_stop_daemon_args="--nicelevel ${LS_NICE} \ - --user ${LS_USER}:${LS_GROUP} \ - --env LS_HEAP_SIZE=${LS_HEAP_SIZE}" -pidfile="${LS_PIDFILE}" - -depend() { - use net - after elasticsearch -} +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." } -start_pre() { +reload() { checkconfig || return 1 + ebegin "Reloading configuration" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} - checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")" - checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")" - checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}" +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" - start-stop-daemon --stop \ - --pidfile="${LS_PIDFILE}" \ - --retry=TERM/5/KILL/5 + 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/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1 deleted file mode 100644 index 91f6297..0000000 --- a/app-admin/logstash-bin/files/logstash.initd-r1 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 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="agent --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" - -checkconfig() { - ebegin "Checking your configuration" - ${command} ${command_args} --configtest - eend $? "Configuration error. Please fix your configuration files." -} - -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/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2 deleted file mode 100644 index 81d5ceb..0000000 --- a/app-admin/logstash-bin/files/logstash.initd-r2 +++ /dev/null @@ -1,65 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 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="agent --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() { - 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/files/logstash.logrotate-r2 b/app-admin/logstash-bin/files/logstash.logrotate-r2 deleted file mode 100644 index 0a9c28c..0000000 --- a/app-admin/logstash-bin/files/logstash.logrotate-r2 +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/logstash/*.err /var/log/logstash/*.log { - copytruncate - compress - missingok - notifempty -} diff --git a/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild deleted file mode 100644 index 7348984..0000000 --- a/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -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}" - -src_install() { - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} - keepdir "/var/log/${MY_PN}" - - insinto "/etc/${MY_PN}/conf.d" - newins "${FILESDIR}/agent.conf.sample" agent.conf.sample - - insinto "/opt/${MY_PN}" - doins -r . - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" - - 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() { - 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-2.2.2.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild deleted file mode 100644 index 7348984..0000000 --- a/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -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}" - -src_install() { - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} - keepdir "/var/log/${MY_PN}" - - insinto "/etc/${MY_PN}/conf.d" - newins "${FILESDIR}/agent.conf.sample" agent.conf.sample - - insinto "/opt/${MY_PN}" - doins -r . - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" - - 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() { - 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-2.2.2-r2.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.4.ebuild similarity index 74% rename from app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild rename to app-admin/logstash-bin/logstash-bin-2.2.4.ebuild index 7fcd1d8..437c3b8 100644 --- a/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild +++ b/app-admin/logstash-bin/logstash-bin-2.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,7 +35,7 @@ src_install() { keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} keepdir "/var/log/${MY_PN}" - insinto "/etc/${MY_PN}/conf.d" + insinto "/usr/share/${MY_PN}" doins "${FILESDIR}/agent.conf.sample" insinto "/opt/${MY_PN}" @@ -43,13 +43,17 @@ src_install() { fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}" + newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}" - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}" - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${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 "" diff --git a/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild deleted file mode 100644 index e7cee56..0000000 --- a/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"; - -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 virtual/jre:1.7 )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup ${MY_PN} - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m -} - -src_install() { - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} - keepdir "/var/log/${MY_PN}" - - insinto "/etc/${MY_PN}/conf.d" - 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" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}" - - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}" - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}" -} - -pkg_postinst() { - 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-2.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.1.ebuild similarity index 72% rename from app-admin/logstash-bin/logstash-bin-2.2.0.ebuild rename to app-admin/logstash-bin/logstash-bin-2.3.1.ebuild index 479b7a4..0735e0c 100644 --- a/app-admin/logstash-bin/logstash-bin-2.2.0.ebuild +++ b/app-admin/logstash-bin/logstash-bin-2.3.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +inherit user + MY_PN="${PN/-bin}" MY_P="${MY_PN}-${PV}" @@ -29,27 +31,34 @@ pkg_setup() { if use standard && use all-plugins; then die "Both standard and all-plugins USE selected, please pick just one." fi + + enewgroup ${MY_PN} + enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m } src_install() { keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} keepdir "/var/log/${MY_PN}" - insinto "/etc/${MY_PN}/conf.d" - newins "${FILESDIR}/agent.conf.sample" agent.conf.sample + 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" insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN} + newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}" - newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN} - newinitd "${FILESDIR}/${MY_PN}.initd" ${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 ""
