www-apps/grafana-bin: revert 12c3eacda7c4d23686eaf10eab21d810cc95ea49 and disable...

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/www-apps/grafana-bin/files/grafana.logrotate b/www-apps/grafana-bin/files/grafana.logrotate
deleted file mode 100644 (file)
index 508db1e..0000000
--- a/www-apps/grafana-bin/files/grafana.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/grafana/grafana*.log {
-    nocompress
-    create 644 root root
-    daily
-    rotate 7
-    missingok
-    size 50M
-}

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
similarity index 78%
rename from www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
rename to www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
index 2afa441185f1154f03c6537c8b90c84921df4c63..3a8308e2d6d7907503f299ded53ade8934e30dab 100644 (file)
--- a/www-apps/grafana-bin/grafana-bin-4.2.0-r1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.2.0-r2.ebuild
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND=""
-RDEPEND="
-       ${DEPEND}
-       app-admin/logrotate"
+RDEPEND="${DEPEND}"
 
 QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
 QA_PRESTRIPPED=${QA_EXECSTACK}
@@ -52,8 +50,13 @@ src_install() {
        fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
        fperms 0750 /var/{lib,log}/grafana
        fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
 
-       # Logrotation support.
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/grafana.logrotate "${PN}"
+postinst() {
+       elog "${PN} has built-in log rotation. Please see [log.file] section of"
+       elog "/etc/grafana/grafana.ini for related settings."
+       elog
+       elog "You may add your own custom configuration for app-admin/logrotate if you"
+       elog "wish to use external rotation of logs. In this case, you also need to make"
+       elog "sure the built-in rotation is turned off."
 }