summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Mozes <hydrapolic@gmail.com>2015-12-22 15:55:37 +0100
committerIan Delaney <idella4@gentoo.org>2015-12-22 23:12:12 +0800
commit84050bc196fbc6b6c81a663ff581e4714ff8bf03 (patch)
treec5fc4da8bb1444ea2c7bf923d10128803c80c88f /www-apps
parentwww-apps/kibana-bin: update manifest (diff)
downloadgentoo-84050bc196fbc6b6c81a663ff581e4714ff8bf03.tar.gz
gentoo-84050bc196fbc6b6c81a663ff581e4714ff8bf03.tar.bz2
gentoo-84050bc196fbc6b6c81a663ff581e4714ff8bf03.zip
www-apps/kibana-bin: bump to 4.1.4, fixes bug #567934
Package-Manager: portage-2.2.26
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/kibana-bin/Manifest3
-rw-r--r--www-apps/kibana-bin/files/kibana.initd-r25
-rw-r--r--www-apps/kibana-bin/kibana-bin-4.1.4.ebuild (renamed from www-apps/kibana-bin/kibana-bin-4.1.3.ebuild)34
3 files changed, 30 insertions, 12 deletions
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index e49501229a0..b3c77f26ac8 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1 +1,2 @@
-DIST kibana-4.1.3-linux-x64.tar.gz 11800636 SHA256 f2cb5389ad0acfbc4006f739d75d5ede541483d1fa6be728bbf547a9d7ddeb4a SHA512 81549c881ec222bcac73a0cf60766752591031ea8f3d28cce98ce06458376036f119353e7b820faef2cb42b23e5f6ef96cd98c1f256b3361513e71877082301c WHIRLPOOL 0d2272361a1b07984cfa7539d4d36e2465b87cdc046ae7cd6d2b6e5da69861feca0e74d9e0ad467d7f4cef9865b72c0bcc1a769bbc6458227fe590e1f99a21b1
+DIST kibana-4.1.4-linux-x64.tar.gz 11805519 SHA256 2d11c63268f49b95726bfa0f3c09cf898ea67b65da3599989d17a27095987b0d SHA512 a89290502d887002a65405e7e10de9ddefb176d262584f35ec58352a7ee9b5a88d0db2949d00eefee3752d1bccd4964f7d4f5935d5fb32c50a46e8b2e1f03a6c WHIRLPOOL 33eeda21ab98a04400d3b26bd10c9f9bbc813a8bf934897fc5dc0d354d25dd223caa60fa09613e3a0db74246d1482708620d23b18c6e740480973f77f769b99f
+DIST kibana-4.1.4-linux-x86.tar.gz 11595160 SHA256 e197ad2936488764b7167a9ea9989c26600fe3797d22c0e522244eef7eb6b809 SHA512 1651a31ee98315dea0cac83f0e80c45deabf0720e0c4b6b4e337512a1f23b8bd31e853f0b59e08cb53189c76369892ebc88dee5d796118aa659dbaa177698e13 WHIRLPOOL 4cd79f2b4bdf96d72626ad4ac992de9127095f3a96a09735a784e678fefc250f0cdbbb1776876afd9596fbe69e884133e2236f4ffe099e89fc159910048a06f4
diff --git a/www-apps/kibana-bin/files/kibana.initd-r2 b/www-apps/kibana-bin/files/kibana.initd-r2
index 85ec76f9c72..d469ec46081 100644
--- a/www-apps/kibana-bin/files/kibana.initd-r2
+++ b/www-apps/kibana-bin/files/kibana.initd-r2
@@ -3,14 +3,15 @@
# Distributed under the terms of the GNU General Public License v2
KIBANA_USER=${KIBANA_USER:-kibana}
+KIBANA_CONFIG=${KIBANA_CONFIG:-/etc/kibana/kibana.yml}
command="/opt/kibana/bin/kibana"
-command_args="--elasticsearch ${ES_INSTANCE}"
+command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG}"
pidfile="/run/kibana.pid"
command_background="true"
start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout /var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err"
start_pre() {
- checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
+ checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
}
diff --git a/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild b/www-apps/kibana-bin/kibana-bin-4.1.4.ebuild
index facd6af6d49..a91ca43f504 100644
--- a/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-4.1.4.ebuild
@@ -1,38 +1,49 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
EAPI=5
-inherit user
+inherit pax-utils user
MY_PN="kibana"
MY_P=${MY_PN}-${PV/_rc/-rc}
DESCRIPTION="Explore and visualize data"
HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz"
+SRC_URI="amd64? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz )
+ x86? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x86.tar.gz )"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND=""
+KEYWORDS="~amd64 ~x86"
RESTRICT="strip"
QA_PREBUILT="opt/kibana/node/bin/node"
-S="${WORKDIR}/${MY_P}-linux-x64"
-
pkg_setup() {
enewgroup ${MY_PN}
enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
}
+src_unpack() {
+ if use amd64; then
+ S="${WORKDIR}/${MY_P}-linux-x64"
+ elif use x86; then
+ S="${WORKDIR}/${MY_P}-linux-x86"
+ fi
+
+ default
+}
+
src_install() {
keepdir /opt/${MY_PN}
keepdir /var/log/${MY_PN}
+ keepdir /etc/${MY_PN}
+
+ insinto /etc/${MY_PN}
+ doins config/*
+ rm -rf config
insinto /etc/logrotate.d
newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
@@ -41,9 +52,14 @@ src_install() {
newinitd "${FILESDIR}"/${MY_PN}.initd-r2 ${MY_PN}
mv * "${D}"/opt/${MY_PN}
+
+ # bug 567934
+ pax-mark m "${ED}/opt/${MY_PN}/node/bin/node"
}
pkg_postinst() {
+ elog "This version of Kibana is compatible with Elasticsearch 1.4.4 - 1.7."
+ elog
elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
elog "in /etc/conf.d/${MY_PN}."
elog