From nobody Sat Dec 03 18:39:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPdr80m2Sz4j6D3; Sat, 3 Dec 2022 18:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPdr80GdRz4HTB; Sat, 3 Dec 2022 18:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670092744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vonn9ejc4xWqQyCAjavU7JO5EKudpOLPlHHyNyH1YGI=; b=RBzK/RBKIjkmcnx13jox0hMSOtSfSO5Awuae7MIlbUvMGw1UeaI1VK6O1ukuLRLGaPXpN2 k7HuBTc0Tdr7fFC/Di6qQE9u7PH5yPJuWb1qHNhjmkPWjdsqFCF6fjPDgfGTBPVfCl0YZZ rnkufg9qY0l+REhzu9Km4XGVF6kB17xKSLYcP6CCa52jlYpBnY0nwdBcuNOnbK4A+sEXCs uv50EW2yJRRAQoXKnFV/dtMyMqYZ6HgN6dZu58AiGXv/ICe/ddSPRU24Jo6GSNRVm/vyCq d4gcPG0zDV8Dg8o1WybLujFAKoUEYJE+Tqp4Kcw7VUCry2Lvfxl9u/0pEjwVWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670092744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vonn9ejc4xWqQyCAjavU7JO5EKudpOLPlHHyNyH1YGI=; b=px0lC+BgZbRZfe0/VaTc9ngEyfKRjxxyanhGbyKiQbWVJHohpBzgzORHQTWA3BrdPBOqwi burdadvkCPb9aSYvc7PFNQBTHI5eOlUVfFrUYkw850S7U6UodTk8wIcIctjMLm+3Dmhbi8 kJB7LYwzIZHIE3NEYhEUfp1IEbJ1NgtlYxOHuy0+3KmR4hMX5JDkrMRsp/VEteZNl2ltTD uMxRr1wGHdcYKzKniJr+Jv+vqdgDvmSnNSjMjZlVJa/B6eJ4OmwfkZsunzpdmttqqSBEd5 QqZS60qbWZDSOUTnuNJ9ALzUkgXGFAUzSCxVe3eQmhiOOYoTSBJJR5+iK4EyKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670092744; a=rsa-sha256; cv=none; b=XMgMYbn7m2VQlMowGAV8WQ1s4ToHZCW9E5YJWNuBvTcuRI6Vogf2sRWXxNMTUxIrDamcc7 doLTn0YwOD0eDyoHbxmWeaueZpTrR3Zn5afMoLHcgWh0I/vJnI7O7B638c0VpQqDiKlCfc cDYuWCL+gYH0dzsXTzO1faNR57RJtk6Fwh/9MBxy9U1zRcLGSjCAQkMms9w8QflOlW2+rs 6HSLZC/N5Y4YIqcLeyaIuVdlGNxw5+cSAHGC6n5s/R6kBKCZGeOXm//SlQn9AGtyW9sCrL DNMO/cLMnTlFFCe9XsOCZ6JMR9U7GZdlVPxZoPfycANKhzKn1Gbz6MHQu6ujhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NPdr76R7dz14d6; Sat, 3 Dec 2022 18:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B3Id3vB021961; Sat, 3 Dec 2022 18:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3Id3B9021960; Sat, 3 Dec 2022 18:39:03 GMT (envelope-from git) Date: Sat, 3 Dec 2022 18:39:03 GMT Message-Id: <202212031839.2B3Id3B9021960@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Felder Subject: git: 90586c77f6c1 - main - net-mgmt/promscale: rc script improvements List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: feld X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90586c77f6c11915db367c7890e30a1c24b5a7f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by feld: URL: https://cgit.FreeBSD.org/ports/commit/?id=90586c77f6c11915db367c7890e30a1c24b5a7f8 commit 90586c77f6c11915db367c7890e30a1c24b5a7f8 Author: Mark Felder AuthorDate: 2022-12-03 18:37:14 +0000 Commit: Mark Felder CommitDate: 2022-12-03 18:38:58 +0000 net-mgmt/promscale: rc script improvements PR: 267907 --- net-mgmt/promscale/Makefile | 1 + net-mgmt/promscale/files/promscale.in | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net-mgmt/promscale/Makefile b/net-mgmt/promscale/Makefile index 98b0ff0269d5..2d1f689bdba8 100644 --- a/net-mgmt/promscale/Makefile +++ b/net-mgmt/promscale/Makefile @@ -1,5 +1,6 @@ PORTNAME= promscale DISTVERSION= 0.16.0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod diff --git a/net-mgmt/promscale/files/promscale.in b/net-mgmt/promscale/files/promscale.in index d3b818ad31cc..04852908602c 100644 --- a/net-mgmt/promscale/files/promscale.in +++ b/net-mgmt/promscale/files/promscale.in @@ -12,10 +12,13 @@ # Set to NO by default # promscale_user (string): # Set user that promscale will run under -# Default is "%%GRAFANA_USER%%" +# Default is "%%USERS%%" # promscale_group (string): # Set group that own promscale files -# Default is "%%GRAFANA_GROUP%%" +# Default is "%%GROUPS%%" +# promscale_args (string): +# Extra arguments for to pass to promscale +# Default is "" . /etc/rc.subr @@ -27,13 +30,13 @@ load_rc_config $name : ${promscale_enable:="NO"} : ${promscale_user:="%%USERS%%"} : ${promscale_group:="%%GROUPS%%"} +: ${promscale_args:=""} pidfile="/var/run/${name}/${name}.pid" -required_files="${promscale_config}" procname="%%PREFIX%%/bin/promscale" command="/usr/sbin/daemon" -command_args="-f -p ${pidfile} -t ${name} /usr/bin/env ${promscale_env} ${procname} ${promscale_args}" +command_args="-f -p ${pidfile} -t ${name} -T ${name} /usr/bin/env ${promscale_env} ${procname} ${promscale_args}" start_precmd="promscale_start_precmd"