git: 889b2ceda43f - 2023Q1 - www/grafana9: fix rc.d script procname
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Mar 2023 20:19:06 UTC
The branch 2023Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=889b2ceda43f9459cf339ede384eb744ce4f6075 commit 889b2ceda43f9459cf339ede384eb744ce4f6075 Author: Dominik Banoviez <dominik@banoviez.com> AuthorDate: 2023-03-10 21:28:28 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-03-22 20:19:06 +0000 www/grafana9: fix rc.d script procname Grafana switched to a unified binary, changing `grafana-server` to be a wrapper script that executes `grafana server` in its place. This patch fixes `procname` in the rc.d script, so that rc.d's process name checking doesn't fail / the service gets properly reported as running. PR: 270098 MFH: 2023Q1 (cherry picked from commit d2f15374931e8b5c5c360a2ecd7794ff492d8d56) --- www/grafana9/Makefile | 1 + www/grafana9/files/grafana.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile index f2a3f20af986..57c9dd128b95 100644 --- a/www/grafana9/Makefile +++ b/www/grafana9/Makefile @@ -1,4 +1,5 @@ PORTNAME= grafana +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 9.3.8 PORTREVISION= 1 diff --git a/www/grafana9/files/grafana.in b/www/grafana9/files/grafana.in index d6c7df4bcae1..16abea5b3db0 100644 --- a/www/grafana9/files/grafana.in +++ b/www/grafana9/files/grafana.in @@ -57,10 +57,10 @@ fi pidfile="/var/run/${name}/${name}.pid" required_files="${grafana_config}" -procname="%%PREFIX%%/bin/grafana-server" +procname="%%PREFIX%%/bin/grafana" command="/usr/sbin/daemon" command_args="-f ${grafana_syslog_output_flags} -p ${pidfile} -t ${name} \ - /usr/bin/env ${grafana_env} ${procname} \ + /usr/bin/env ${grafana_env} ${procname} server \ -config=${grafana_config} \ -homepath=${grafana_homepath} \ ${grafana_args}"