www-apps/grafana-bin: Fix pidfile handling

Package-Manager: portage-2.3.0

diff --git a/www-apps/grafana-bin/files/grafana.initd.2 b/www-apps/grafana-bin/files/grafana.initd.2
new file mode 100644 (file)
index 0000000..14b0b1f
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd.2
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+       need localmount
+}
+
+start() {
+       ebegin "Starting grafana server"
+
+       start-stop-daemon --start -b \
+               --make-pidfile \
+               --pidfile /run/grafana.pid \
+               --chdir /usr/share/grafana \
+               --user ${GRAFANA_USER}:${GRAFANA_GROUP} \
+               --exec /usr/bin/grafana-server -- \
+               -config=/etc/grafana/grafana.ini \
+               cfg:default.paths.data=/var/lib/grafana \
+               cfg:default.paths.logs=/var/log/grafana
+
+       eend $?
+}
+
+stop() {
+       ebegin "Stopping grafana server"
+
+       start-stop-daemon --stop \
+               --pidfile /run/grafana.pid \
+               --user "${GRAFANA_USER}" \
+               --retry=TERM/20/KILL/5
+
+       eend $?
+}

diff --git a/www-apps/grafana-bin/grafana-bin-3.1.0.ebuild b/www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
similarity index 95%
rename from www-apps/grafana-bin/grafana-bin-3.1.0.ebuild
rename to www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
index 159d2d8894ee0b3ef00c730d04eb21528a2e616a..37523480bc5a3051b768c7d3b7628a5a04b203ce 100644 (file)
--- a/www-apps/grafana-bin/grafana-bin-3.1.0.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
@@ -43,7 +43,7 @@ src_install() {
        dobin bin/grafana-server
 
        newconfd "${FILESDIR}"/grafana.confd grafana
-       newinitd "${FILESDIR}"/grafana.initd grafana
+       newinitd "${FILESDIR}"/grafana.initd.2 grafana
 
        keepdir /var/{lib,log}/grafana
        fowners grafana:grafana /var/{lib,log}/grafana