| 1 |
commit: 84050bc196fbc6b6c81a663ff581e4714ff8bf03 |
| 2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 22 14:55:37 2015 +0000 |
| 4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 15:12:12 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84050bc1 |
| 7 |
|
| 8 |
www-apps/kibana-bin: bump to 4.1.4, fixes bug #567934 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
www-apps/kibana-bin/Manifest | 3 +- |
| 13 |
www-apps/kibana-bin/files/kibana.initd-r2 | 5 ++-- |
| 14 |
...na-bin-4.1.3.ebuild => kibana-bin-4.1.4.ebuild} | 34 ++++++++++++++++------ |
| 15 |
3 files changed, 30 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest |
| 18 |
index e495012..b3c77f2 100644 |
| 19 |
--- a/www-apps/kibana-bin/Manifest |
| 20 |
+++ b/www-apps/kibana-bin/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
-DIST kibana-4.1.3-linux-x64.tar.gz 11800636 SHA256 f2cb5389ad0acfbc4006f739d75d5ede541483d1fa6be728bbf547a9d7ddeb4a SHA512 81549c881ec222bcac73a0cf60766752591031ea8f3d28cce98ce06458376036f119353e7b820faef2cb42b23e5f6ef96cd98c1f256b3361513e71877082301c WHIRLPOOL 0d2272361a1b07984cfa7539d4d36e2465b87cdc046ae7cd6d2b6e5da69861feca0e74d9e0ad467d7f4cef9865b72c0bcc1a769bbc6458227fe590e1f99a21b1 |
| 23 |
+DIST kibana-4.1.4-linux-x64.tar.gz 11805519 SHA256 2d11c63268f49b95726bfa0f3c09cf898ea67b65da3599989d17a27095987b0d SHA512 a89290502d887002a65405e7e10de9ddefb176d262584f35ec58352a7ee9b5a88d0db2949d00eefee3752d1bccd4964f7d4f5935d5fb32c50a46e8b2e1f03a6c WHIRLPOOL 33eeda21ab98a04400d3b26bd10c9f9bbc813a8bf934897fc5dc0d354d25dd223caa60fa09613e3a0db74246d1482708620d23b18c6e740480973f77f769b99f |
| 24 |
+DIST kibana-4.1.4-linux-x86.tar.gz 11595160 SHA256 e197ad2936488764b7167a9ea9989c26600fe3797d22c0e522244eef7eb6b809 SHA512 1651a31ee98315dea0cac83f0e80c45deabf0720e0c4b6b4e337512a1f23b8bd31e853f0b59e08cb53189c76369892ebc88dee5d796118aa659dbaa177698e13 WHIRLPOOL 4cd79f2b4bdf96d72626ad4ac992de9127095f3a96a09735a784e678fefc250f0cdbbb1776876afd9596fbe69e884133e2236f4ffe099e89fc159910048a06f4 |
| 25 |
|
| 26 |
diff --git a/www-apps/kibana-bin/files/kibana.initd-r2 b/www-apps/kibana-bin/files/kibana.initd-r2 |
| 27 |
index 85ec76f..d469ec4 100644 |
| 28 |
--- a/www-apps/kibana-bin/files/kibana.initd-r2 |
| 29 |
+++ b/www-apps/kibana-bin/files/kibana.initd-r2 |
| 30 |
@@ -3,14 +3,15 @@ |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
KIBANA_USER=${KIBANA_USER:-kibana} |
| 34 |
+KIBANA_CONFIG=${KIBANA_CONFIG:-/etc/kibana/kibana.yml} |
| 35 |
|
| 36 |
command="/opt/kibana/bin/kibana" |
| 37 |
-command_args="--elasticsearch ${ES_INSTANCE}" |
| 38 |
+command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG}" |
| 39 |
|
| 40 |
pidfile="/run/kibana.pid" |
| 41 |
command_background="true" |
| 42 |
start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout /var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err" |
| 43 |
|
| 44 |
start_pre() { |
| 45 |
- checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana" |
| 46 |
+ checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana" |
| 47 |
} |
| 48 |
|
| 49 |
diff --git a/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild b/www-apps/kibana-bin/kibana-bin-4.1.4.ebuild |
| 50 |
similarity index 59% |
| 51 |
rename from www-apps/kibana-bin/kibana-bin-4.1.3.ebuild |
| 52 |
rename to www-apps/kibana-bin/kibana-bin-4.1.4.ebuild |
| 53 |
index facd6af..a91ca43 100644 |
| 54 |
--- a/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild |
| 55 |
+++ b/www-apps/kibana-bin/kibana-bin-4.1.4.ebuild |
| 56 |
@@ -1,38 +1,49 @@ |
| 57 |
# Copyright 1999-2015 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: $ |
| 60 |
+# $Id$ |
| 61 |
|
| 62 |
EAPI=5 |
| 63 |
|
| 64 |
-inherit user |
| 65 |
+inherit pax-utils user |
| 66 |
|
| 67 |
MY_PN="kibana" |
| 68 |
MY_P=${MY_PN}-${PV/_rc/-rc} |
| 69 |
|
| 70 |
DESCRIPTION="Explore and visualize data" |
| 71 |
HOMEPAGE="https://www.elastic.co/products/kibana" |
| 72 |
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz" |
| 73 |
+SRC_URI="amd64? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz ) |
| 74 |
+ x86? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x86.tar.gz )" |
| 75 |
|
| 76 |
LICENSE="Apache-2.0" |
| 77 |
SLOT="0" |
| 78 |
-KEYWORDS="~amd64" |
| 79 |
- |
| 80 |
-DEPEND="" |
| 81 |
-RDEPEND="" |
| 82 |
+KEYWORDS="~amd64 ~x86" |
| 83 |
|
| 84 |
RESTRICT="strip" |
| 85 |
QA_PREBUILT="opt/kibana/node/bin/node" |
| 86 |
|
| 87 |
-S="${WORKDIR}/${MY_P}-linux-x64" |
| 88 |
- |
| 89 |
pkg_setup() { |
| 90 |
enewgroup ${MY_PN} |
| 91 |
enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN} |
| 92 |
} |
| 93 |
|
| 94 |
+src_unpack() { |
| 95 |
+ if use amd64; then |
| 96 |
+ S="${WORKDIR}/${MY_P}-linux-x64" |
| 97 |
+ elif use x86; then |
| 98 |
+ S="${WORKDIR}/${MY_P}-linux-x86" |
| 99 |
+ fi |
| 100 |
+ |
| 101 |
+ default |
| 102 |
+} |
| 103 |
+ |
| 104 |
src_install() { |
| 105 |
keepdir /opt/${MY_PN} |
| 106 |
keepdir /var/log/${MY_PN} |
| 107 |
+ keepdir /etc/${MY_PN} |
| 108 |
+ |
| 109 |
+ insinto /etc/${MY_PN} |
| 110 |
+ doins config/* |
| 111 |
+ rm -rf config |
| 112 |
|
| 113 |
insinto /etc/logrotate.d |
| 114 |
newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN} |
| 115 |
@@ -41,9 +52,14 @@ src_install() { |
| 116 |
newinitd "${FILESDIR}"/${MY_PN}.initd-r2 ${MY_PN} |
| 117 |
|
| 118 |
mv * "${D}"/opt/${MY_PN} |
| 119 |
+ |
| 120 |
+ # bug 567934 |
| 121 |
+ pax-mark m "${ED}/opt/${MY_PN}/node/bin/node" |
| 122 |
} |
| 123 |
|
| 124 |
pkg_postinst() { |
| 125 |
+ elog "This version of Kibana is compatible with Elasticsearch 1.4.4 - 1.7." |
| 126 |
+ elog |
| 127 |
elog "Be sure to point ES_INSTANCE to your Elasticsearch instance" |
| 128 |
elog "in /etc/conf.d/${MY_PN}." |
| 129 |
elog |
Archives