From 59b99ad6772969fa9168173bc6e1472e44326aa8 Mon Sep 17 00:00:00 2001
From: Yves Fischer <yvesf+git@xapek.org>
Date: Mon, 4 May 2015 21:39:58 +0000
Subject: correct user, create lib and logdir

---
 www/grafana2/Makefile  | 6 ++++--
 www/grafana2/pkg-plist | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'www')

diff --git a/www/grafana2/Makefile b/www/grafana2/Makefile
index 157dbea..56b9499 100644
--- a/www/grafana2/Makefile
+++ b/www/grafana2/Makefile
@@ -39,8 +39,8 @@ GRAFANA_GROUP?=	grafana
 GRAFANA_HOMEDIR=${PREFIX}/share/grafana2
 GRAFANA_PIDFILE=/var/run/${PORTNAME}.pid
 
-USERS=		${INFLUXD_USER}
-GROUPS=		${INFLUXD_GROUP}
+USERS=		${GRAFANA_USER}
+GROUPS=		${GRAFANA_GROUP}
 
 STRIP=		# stripping can break go binaries
 
@@ -68,6 +68,8 @@ do-build:
 #do-install:
 
 post-install:
+	${MKDIR} ${STAGEDIR}/var/lib/${PORTNAME}/
+	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}/
 	${INSTALL_PROGRAM} ${WRKDIR}/src/github.com/grafana/grafana/grafana ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	(cd ${WRKDIR}/src/github.com/grafana/grafana && \
 		${COPYTREE_SHARE} public \
diff --git a/www/grafana2/pkg-plist b/www/grafana2/pkg-plist
index d7186e8..218545b 100644
--- a/www/grafana2/pkg-plist
+++ b/www/grafana2/pkg-plist
@@ -1,7 +1,9 @@
 bin/%%GO_PKGNAME%%
 %%ETCDIR%%.ini
-@dir(influxd,%%GRAFANA_GROUP%%,0750) /var/lib/%%GO_PKGNAME%%
-@dir(influxd,%%GRAFANA_GROUP%%,0750) %%DATADIR%%
+@dir(%%GRAFANA_USER%%,%%GRAFANA_GROUP%%,0750) /var/log/%%GO_PKGNAME%%
+@dir(%%GRAFANA_USER%%,%%GRAFANA_GROUP%%,0750) /var/lib/%%GO_PKGNAME%%
+@dir /var/lib
+@dir(%%GRAFANA_USER%%,%%GRAFANA_GROUP%%,0750) %%DATADIR%%
 %%DATADIR%%/conf/defaults.ini
 %%DATADIR%%/public/app/app.js
 %%DATADIR%%/public/app/components/config.js
-- 
cgit v1.2.1