1 |
commit: 88ca99b1f3d8b29beaa1ad97cf6aedf47c73eda3 |
2 |
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 31 11:09:21 2017 +0000 |
4 |
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 31 11:09:21 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ca99b1 |
7 |
|
8 |
www-apps/grafana-bin: Add v4.3.1 and clean up old versions |
9 |
|
10 |
www-apps/grafana-bin/Manifest | 1 + |
11 |
www-apps/grafana-bin/grafana-bin-4.0.1.ebuild | 50 ---------------------- |
12 |
www-apps/grafana-bin/grafana-bin-4.1.1.ebuild | 50 ---------------------- |
13 |
...a-bin-4.2.0.ebuild => grafana-bin-4.3.1.ebuild} | 12 +++++- |
14 |
4 files changed, 11 insertions(+), 102 deletions(-) |
15 |
|
16 |
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest |
17 |
index 1c9562d30ab..d8701226838 100644 |
18 |
--- a/www-apps/grafana-bin/Manifest |
19 |
+++ b/www-apps/grafana-bin/Manifest |
20 |
@@ -2,3 +2,4 @@ DIST grafana-bin-4.0.1.tar.gz 42179027 SHA256 910327d0d7b7597cb471a697766baea170 |
21 |
DIST grafana-bin-4.1.1.tar.gz 45019506 SHA256 51464c7569638bbfd7c6a7397c8f5f296c6839a113360ff5f908d454a9643aeb SHA512 74df71c1f4b8d84046ed94447d01a759197486232ff4818a10e5e4656c6fd025c9aa224df8c8f02770a77a7483398c881aebfd40a1da12e8d83d8ec97980d3db WHIRLPOOL b8f8d4c59d49303bdb9f53de9d67481083e41ff2d9be43dab2cacfc6bee742bf310cabba0766c58c80c7d42a7aad7e2633d3e57d4603ea23a1fd4a14faba7e16 |
22 |
DIST grafana-bin-4.1.2.tar.gz 45024995 SHA256 b8111cd014e9c202dd1b168b924731a140161e9e43e32f3ca7ae18db850af6c4 SHA512 4a0825c99eebb4185036cf5e1fd2ec26ff12913e474ac6014bb677329e1c92ee866be4ff53bd2560d91ebe38d7d7e3ae310e05b221e415046afbafd7a164e3cf WHIRLPOOL 6c4eda846cdd4ff4ef0ef34a0fd3b45da45cbc0aa0fa46d707616809c3fed322146b89678dcd11de2d31bf6ca94efa6afb7cd9f9423b5cac1847da209b7bae6c |
23 |
DIST grafana-bin-4.2.0.tar.gz 45741731 SHA256 e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 SHA512 8c100f5d61b8ebac2abb3894d3f37e926c6fd81eb3ab68fd966d2bc38d9ec2386fee15dd745f5efe7c0e52de06321f3e983fdab0185b3da3f28562b54c60994f WHIRLPOOL 08d00ab71ae8dba828c98661c4250b5e4a014f75d25b9eb80daee445570b972b2babd6da89f5aba76ca1d32b1d6e71376066c6387d6bb92c1f7299fbc7087d4b |
24 |
+DIST grafana-bin-4.3.1.tar.gz 47036155 SHA256 c046fa8259a218b10bbba530380361434df04a207f61e2a0185596067ff4659f SHA512 7c91a7cc79edbc82a038fe21e1e993e8426c9a384aef2648522c130b775f13a7aee6e53a8fbb6546be4713b17cf8c210ff09cad29f519dad94b3f9bf670aef77 WHIRLPOOL 3369e6616c6de1efab23dedc2617a64a2c77a758c5f300988d897b35749f5cab4726b2bea6243eb1d837370448cd77aa265e198ef5a1bd5a3954c4f05be96efd |
25 |
|
26 |
diff --git a/www-apps/grafana-bin/grafana-bin-4.0.1.ebuild b/www-apps/grafana-bin/grafana-bin-4.0.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 6c7c80a25b6..00000000000 |
29 |
--- a/www-apps/grafana-bin/grafana-bin-4.0.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,50 +0,0 @@ |
32 |
-# Copyright 1999-2016 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=5 |
36 |
- |
37 |
-inherit user |
38 |
-MY_PN=${PN/-bin/} |
39 |
-MY_PV="4.0.1-1480694114" |
40 |
-S=${WORKDIR}/${MY_PN}-${MY_PV} |
41 |
- |
42 |
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" |
43 |
-HOMEPAGE="http://grafana.org" |
44 |
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="Apache-2.0" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64" |
49 |
-IUSE="" |
50 |
- |
51 |
-DEPEND="" |
52 |
-RDEPEND="${DEPEND} |
53 |
- >=dev-lang/go-1.5 |
54 |
- net-libs/nodejs |
55 |
-" |
56 |
- |
57 |
-pkg_setup() { |
58 |
- enewgroup grafana |
59 |
- enewuser grafana -1 -1 /usr/share/grafana grafana |
60 |
-} |
61 |
- |
62 |
-src_install() { |
63 |
- keepdir /etc/grafana |
64 |
- insinto /etc/grafana |
65 |
- newins "${S}"/conf/sample.ini grafana.ini |
66 |
- rm "${S}"/conf/sample.ini |
67 |
- |
68 |
- # Frontend assets |
69 |
- insinto /usr/share/${MY_PN} |
70 |
- doins -r public conf vendor |
71 |
- |
72 |
- dobin bin/grafana-cli |
73 |
- dobin bin/grafana-server |
74 |
- |
75 |
- newconfd "${FILESDIR}"/grafana.confd grafana |
76 |
- newinitd "${FILESDIR}"/grafana.initd.2 grafana |
77 |
- |
78 |
- keepdir /var/{lib,log}/grafana |
79 |
- fowners grafana:grafana /var/{lib,log}/grafana |
80 |
- fperms 0750 /var/{lib,log}/grafana |
81 |
-} |
82 |
|
83 |
diff --git a/www-apps/grafana-bin/grafana-bin-4.1.1.ebuild b/www-apps/grafana-bin/grafana-bin-4.1.1.ebuild |
84 |
deleted file mode 100644 |
85 |
index 51a609044a8..00000000000 |
86 |
--- a/www-apps/grafana-bin/grafana-bin-4.1.1.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,50 +0,0 @@ |
89 |
-# Copyright 1999-2017 Gentoo Foundation |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI=5 |
93 |
- |
94 |
-inherit user |
95 |
-MY_PN=${PN/-bin/} |
96 |
-MY_PV="4.1.1-1484211277" |
97 |
-S=${WORKDIR}/${MY_PN}-${MY_PV} |
98 |
- |
99 |
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" |
100 |
-HOMEPAGE="http://grafana.org" |
101 |
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz" |
102 |
- |
103 |
-LICENSE="Apache-2.0" |
104 |
-SLOT="0" |
105 |
-KEYWORDS="~amd64" |
106 |
-IUSE="" |
107 |
- |
108 |
-DEPEND="" |
109 |
-RDEPEND="${DEPEND} |
110 |
- >=dev-lang/go-1.5 |
111 |
- net-libs/nodejs |
112 |
-" |
113 |
- |
114 |
-pkg_setup() { |
115 |
- enewgroup grafana |
116 |
- enewuser grafana -1 -1 /usr/share/grafana grafana |
117 |
-} |
118 |
- |
119 |
-src_install() { |
120 |
- keepdir /etc/grafana |
121 |
- insinto /etc/grafana |
122 |
- newins "${S}"/conf/sample.ini grafana.ini |
123 |
- rm "${S}"/conf/sample.ini |
124 |
- |
125 |
- # Frontend assets |
126 |
- insinto /usr/share/${MY_PN} |
127 |
- doins -r public conf vendor |
128 |
- |
129 |
- dobin bin/grafana-cli |
130 |
- dobin bin/grafana-server |
131 |
- |
132 |
- newconfd "${FILESDIR}"/grafana.confd grafana |
133 |
- newinitd "${FILESDIR}"/grafana.initd.2 grafana |
134 |
- |
135 |
- keepdir /var/{lib,log}/grafana |
136 |
- fowners grafana:grafana /var/{lib,log}/grafana |
137 |
- fperms 0750 /var/{lib,log}/grafana |
138 |
-} |
139 |
|
140 |
diff --git a/www-apps/grafana-bin/grafana-bin-4.2.0.ebuild b/www-apps/grafana-bin/grafana-bin-4.3.1.ebuild |
141 |
similarity index 77% |
142 |
rename from www-apps/grafana-bin/grafana-bin-4.2.0.ebuild |
143 |
rename to www-apps/grafana-bin/grafana-bin-4.3.1.ebuild |
144 |
index 51e04d5e97c..3a8308e2d6d 100644 |
145 |
--- a/www-apps/grafana-bin/grafana-bin-4.2.0.ebuild |
146 |
+++ b/www-apps/grafana-bin/grafana-bin-4.3.1.ebuild |
147 |
@@ -15,7 +15,6 @@ SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${ |
148 |
LICENSE="Apache-2.0" |
149 |
SLOT="0" |
150 |
KEYWORDS="~amd64" |
151 |
-IUSE="" |
152 |
|
153 |
DEPEND="" |
154 |
RDEPEND="${DEPEND}" |
155 |
@@ -32,7 +31,7 @@ src_install() { |
156 |
keepdir /etc/grafana |
157 |
insinto /etc/grafana |
158 |
newins "${S}"/conf/sample.ini grafana.ini |
159 |
- rm "${S}"/conf/sample.ini |
160 |
+ rm "${S}"/conf/sample.ini || die |
161 |
|
162 |
# Frontend assets |
163 |
insinto /usr/share/${MY_PN} |
164 |
@@ -52,3 +51,12 @@ src_install() { |
165 |
fperms 0750 /var/{lib,log}/grafana |
166 |
fperms 0750 /var/lib/grafana/{dashboards,plugins} |
167 |
} |
168 |
+ |
169 |
+postinst() { |
170 |
+ elog "${PN} has built-in log rotation. Please see [log.file] section of" |
171 |
+ elog "/etc/grafana/grafana.ini for related settings." |
172 |
+ elog |
173 |
+ elog "You may add your own custom configuration for app-admin/logrotate if you" |
174 |
+ elog "wish to use external rotation of logs. In this case, you also need to make" |
175 |
+ elog "sure the built-in rotation is turned off." |
176 |
+} |