Fri Dec 15 18:35:48 2023 UTC (160d)
grafana: start grafana a different way so rc.d script's status command works

'grafana-server ...' ends up starting 'grafana server ...' which made the
process name check fail

Bump PKGREVISION.


(wiz)
diff -r1.112 -r1.113 pkgsrc/www/grafana/Makefile
diff -r1.6 -r1.7 pkgsrc/www/grafana/files/grafana.sh
cvs diff -r1.112 -r1.113 pkgsrc/www/grafana/Makefile (expand / switch to unified diff)

--- pkgsrc/www/grafana/Makefile 2023/12/15 17:58:18 1.112
+++ pkgsrc/www/grafana/Makefile 2023/12/15 18:35:48 1.113
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.112 2023/12/15 17:58:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.113 2023/12/15 18:35:48 wiz Exp $
2 2
3DISTNAME= grafana-10.1.0 3DISTNAME= grafana-10.1.0
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_GITHUB:=grafana/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=grafana/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://grafana.com/ 10HOMEPAGE= https://grafana.com/
11COMMENT= Metrics dashboard and graph editor 11COMMENT= Metrics dashboard and graph editor
12LICENSE= gnu-agpl-v3 AND apache-2.0 AND mit 12LICENSE= gnu-agpl-v3 AND apache-2.0 AND mit
13 13
14DISTFILES= ${DEFAULT_DISTFILES} 14DISTFILES= ${DEFAULT_DISTFILES}
15 15
16# We don't have suitable infrastructure in pkgsrc for generating frontend 16# We don't have suitable infrastructure in pkgsrc for generating frontend
17# assets, so we'll extract prebuilt frontend assets. 17# assets, so we'll extract prebuilt frontend assets.
cvs diff -r1.6 -r1.7 pkgsrc/www/grafana/files/grafana.sh (expand / switch to unified diff)

--- pkgsrc/www/grafana/files/grafana.sh 2022/11/29 22:06:47 1.6
+++ pkgsrc/www/grafana/files/grafana.sh 2023/12/15 18:35:48 1.7
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: grafana.sh,v 1.6 2022/11/29 22:06:47 wiz Exp $ 3# $NetBSD: grafana.sh,v 1.7 2023/12/15 18:35:48 wiz Exp $
4# 4#
5# PROVIDE: grafana 5# PROVIDE: grafana
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8# 8#
9# Consider installing pkgtools/rc.subr in unprivileged. 9# Consider installing pkgtools/rc.subr in unprivileged.
10# 10#
11# You will need to set some variables in @SYSCONFBASE@/rc.conf to start grafana: 11# You will need to set some variables in @SYSCONFBASE@/rc.conf to start grafana:
12# 12#
13# grafana=YES 13# grafana=YES
14 14
15if [ -f @SYSCONFBASE@/rc.subr ]; then 15if [ -f @SYSCONFBASE@/rc.subr ]; then
16 $_rc_subr_loaded . @SYSCONFBASE@/rc.subr 16 $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
17fi 17fi
18 18
19name="grafana" 19name="grafana"
20rcvar=$name 20rcvar=$name
21grafana_user="@GRAFANA_USER@" 21grafana_user="@GRAFANA_USER@"
22grafana_group="@GRAFANA_GROUP@" 22grafana_group="@GRAFANA_GROUP@"
23grafana_home="@PREFIX@/share/${name}" 23grafana_home="@PREFIX@/share/${name}"
24pidfile="@VARBASE@/run/${name}.pid" 24pidfile="@VARBASE@/run/${name}.pid"
25command="@PREFIX@/bin/grafana-server" 25command="@PREFIX@/bin/grafana"
26command_args="-homepath ${grafana_home} -config @PKG_SYSCONFDIR@/grafana.conf -pidfile ${pidfile} < /dev/null > /dev/null 2>&1 &" 26command_args="server -homepath ${grafana_home} -config @PKG_SYSCONFDIR@/grafana.conf -pidfile ${pidfile} < /dev/null > /dev/null 2>&1 &"
27start_precmd="grafana_precmd" 27start_precmd="grafana_precmd"
28 28
29grafana_precmd() { 29grafana_precmd() {
30 if [ ! -r "${pidfile}" ]; then 30 if [ ! -r "${pidfile}" ]; then
31 touch "${pidfile}" 31 touch "${pidfile}"
32 chown "${grafana_user}:${grafana_group}" "${pidfile}" 32 chown "${grafana_user}:${grafana_group}" "${pidfile}"
33 chmod 644 "${pidfile}" 33 chmod 644 "${pidfile}"
34 fi 34 fi
35} 35}
36 36
37if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then 37if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
38 load_rc_config $name 38 load_rc_config $name
39 run_rc_command "$1" 39 run_rc_command "$1"