From 21e1ed587a5f803da0b927a8f3f95e3e5f624a11 Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Mon, 18 Jul 2016 17:33:01 +0200
Subject: www-apps/grafana-bin: Fix pidfile handling

Package-Manager: portage-2.3.0
---
 www-apps/grafana-bin/files/grafana.initd.2       | 35 ++++++++++++++++
 www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild | 51 ++++++++++++++++++++++++
 www-apps/grafana-bin/grafana-bin-3.1.0.ebuild    | 51 ------------------------
 3 files changed, 86 insertions(+), 51 deletions(-)
 create mode 100644 www-apps/grafana-bin/files/grafana.initd.2
 create mode 100644 www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
 delete mode 100644 www-apps/grafana-bin/grafana-bin-3.1.0.ebuild

(limited to 'www-apps/grafana-bin')

diff --git a/www-apps/grafana-bin/files/grafana.initd.2 b/www-apps/grafana-bin/files/grafana.initd.2
new file mode 100644
index 000000000000..14b0b1fdfa04
--- /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-r1.ebuild b/www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..37523480bc5a
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-3.1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user
+MY_PN=${PN/-bin/}
+MY_PV="3.1.0-1468321182"
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-lang/go-1.5
+	net-libs/nodejs
+"
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf vendor
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.2 grafana
+
+	keepdir /var/{lib,log}/grafana
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fperms 0750 /var/{lib,log}/grafana
+}
diff --git a/www-apps/grafana-bin/grafana-bin-3.1.0.ebuild b/www-apps/grafana-bin/grafana-bin-3.1.0.ebuild
deleted file mode 100644
index 159d2d8894ee..000000000000
--- a/www-apps/grafana-bin/grafana-bin-3.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-MY_PN=${PN/-bin/}
-MY_PV="3.1.0-1468321182"
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-lang/go-1.5
-	net-libs/nodejs
-"
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
-
-	keepdir /var/{lib,log}/grafana
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fperms 0750 /var/{lib,log}/grafana
-}
-- 
cgit v1.2.3-65-gdbad