1 |
commit: f42d6679c038c3efcc257d38547267d01823aea9 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 11 16:37:46 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 11 16:39:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42d6679 |
7 |
|
8 |
www-apps/grafana-bin: revert 12c3eacda7c4d23686eaf10eab21d810cc95ea49 and disable log rotation support. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
www-apps/grafana-bin/files/grafana.logrotate | 8 -------- |
13 |
...na-bin-4.2.0-r1.ebuild => grafana-bin-4.2.0-r2.ebuild} | 15 +++++++++------ |
14 |
2 files changed, 9 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/www-apps/grafana-bin/files/grafana.logrotate b/www-apps/grafana-bin/files/grafana.logrotate |
17 |
deleted file mode 100644 |
18 |
index 508db1e16ce..00000000000 |
19 |
--- a/www-apps/grafana-bin/files/grafana.logrotate |
20 |
+++ /dev/null |
21 |
@@ -1,8 +0,0 @@ |
22 |
-/var/log/grafana/grafana*.log { |
23 |
- nocompress |
24 |
- create 644 root root |
25 |
- daily |
26 |
- rotate 7 |
27 |
- missingok |
28 |
- size 50M |
29 |
-} |
30 |
|
31 |
diff --git a/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild b/www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild |
32 |
similarity index 78% |
33 |
rename from www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild |
34 |
rename to www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild |
35 |
index 2afa441185f..3a8308e2d6d 100644 |
36 |
--- a/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild |
37 |
+++ b/www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild |
38 |
@@ -17,9 +17,7 @@ SLOT="0" |
39 |
KEYWORDS="~amd64" |
40 |
|
41 |
DEPEND="" |
42 |
-RDEPEND=" |
43 |
- ${DEPEND} |
44 |
- app-admin/logrotate" |
45 |
+RDEPEND="${DEPEND}" |
46 |
|
47 |
QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs" |
48 |
QA_PRESTRIPPED=${QA_EXECSTACK} |
49 |
@@ -52,8 +50,13 @@ src_install() { |
50 |
fowners grafana:grafana /var/lib/grafana/{dashboards,plugins} |
51 |
fperms 0750 /var/{lib,log}/grafana |
52 |
fperms 0750 /var/lib/grafana/{dashboards,plugins} |
53 |
+} |
54 |
|
55 |
- # Logrotation support. |
56 |
- insinto /etc/logrotate.d |
57 |
- newins "${FILESDIR}"/grafana.logrotate "${PN}" |
58 |
+postinst() { |
59 |
+ elog "${PN} has built-in log rotation. Please see [log.file] section of" |
60 |
+ elog "/etc/grafana/grafana.ini for related settings." |
61 |
+ elog |
62 |
+ elog "You may add your own custom configuration for app-admin/logrotate if you" |
63 |
+ elog "wish to use external rotation of logs. In this case, you also need to make" |
64 |
+ elog "sure the built-in rotation is turned off." |
65 |
} |