CVS commit: pkgsrc/www/grafana

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 15 18:35:48 UTC 2023

Modified Files:
        pkgsrc/www/grafana: Makefile
        pkgsrc/www/grafana/files: grafana.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/www/grafana/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/grafana/files/grafana.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/grafana/Makefile
diff -u pkgsrc/www/grafana/Makefile:1.112 pkgsrc/www/grafana/Makefile:1.113
--- pkgsrc/www/grafana/Makefile:1.112   Fri Dec 15 17:58:18 2023
+++ pkgsrc/www/grafana/Makefile Fri Dec 15 18:35:48 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.112 2023/12/15 17:58:18 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2023/12/15 18:35:48 wiz Exp $
 
 DISTNAME=      grafana-10.1.0
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/www/grafana/files/grafana.sh
diff -u pkgsrc/www/grafana/files/grafana.sh:1.6 pkgsrc/www/grafana/files/grafana.sh:1.7
--- pkgsrc/www/grafana/files/grafana.sh:1.6     Tue Nov 29 22:06:47 2022
+++ pkgsrc/www/grafana/files/grafana.sh Fri Dec 15 18:35:48 2023
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: grafana.sh,v 1.6 2022/11/29 22:06:47 wiz Exp $
+# $NetBSD: grafana.sh,v 1.7 2023/12/15 18:35:48 wiz Exp $
 #
 # PROVIDE: grafana
 # REQUIRE: DAEMON
@@ -22,8 +22,8 @@ grafana_user="@GRAFANA_USER@"
 grafana_group="@GRAFANA_GROUP@"
 grafana_home="@PREFIX@/share/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
-command="@PREFIX@/bin/grafana-server"
-command_args="-homepath ${grafana_home} -config @PKG_SYSCONFDIR@/grafana.conf -pidfile ${pidfile} < /dev/null > /dev/null 2>&1 &"
+command="@PREFIX@/bin/grafana"
+command_args="server -homepath ${grafana_home} -config @PKG_SYSCONFDIR@/grafana.conf -pidfile ${pidfile} < /dev/null > /dev/null 2>&1 &"
 start_precmd="grafana_precmd"
 
 grafana_precmd() {