From nobody Wed Jan 25 07:29:41 2023 X-Original-To: dev-commits-ports-all@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 4P1wTK3pRzz3bwTj; Wed, 25 Jan 2023 07:29:41 +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 4P1wTK3L7jz3LH6; Wed, 25 Jan 2023 07:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674631781; 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=33u8xcJB8FADa9LhBySnPjOlQtUmM9RiNkCXmLMWOMY=; b=JulyItKBRR8NlK4fWgvhrTKF+tdP9YfUwLOck9TOT4XDwUgwlPHAGxK4C5Y1oWW3OpEmfY lO1DFNuj7lfIyNHmRs7ESkcYf1cYuh0cmmLLRQsVe1kc+YHjWtCzAHmh/LHAvZhf1lVu7A AP8x4i9jJ2VqSOqS2B1DiTSH/WALrfJzZJmHHNCrMkCHvQrJt9OTkOf7vxDNAReuspkt4T 0bbLaUAZpMytvRkGstG/2wcryAqRdzuJJCgX/sW3k65+P4cJV7jzeL7VEsRTxdLC+sldXz 0zq1dmHniEf+go4I5NwdgklbofrS7LEOH2QKlgWW/sYLszaNV3mARPWUdsGPTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674631781; 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=33u8xcJB8FADa9LhBySnPjOlQtUmM9RiNkCXmLMWOMY=; b=RMFPtGQIx/QfbdGFCa6cSYQfSAEsrYmco/YmIJUtoLZ2zGLUf8GUsFo73kjpRl09ctjIgQ uCCc03F+mHrj58ArWf3O7Mmft2TsL8wIc1DypfvlEzX0SKp6goDPayIxQNR4WbTM7kRFLn UA6HfakiVnP/7bxhvI+Rh9qUIKGRLgvKFn9b6v1u6GABogCIbLjsJS/OnBlTz0vzmUl2tC wWCRnXwIkR9Yu/18LWTuHW0USecXN0VL+At3OUxOki+WH9pWO+x3h+x6+YkIH+ABpY75v3 qqtIvLzkMRzMnGAFM3UCEzFV72X4hlIQxxgr6xy2sTdLz7tWyRv5Xl2B3SZ4Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674631781; a=rsa-sha256; cv=none; b=my+6ARdtlj2FCIiNow5gs5oFmfPo8XfUC1MpVV4kV2jkOqgj0Y9Yau2VNuKahMJGc9dLqT 6wXfOu0UBQM79N04oNihal9S3NSz7DCWcrvYicJgq+nVUGK+oQ109J5G0pOo5DYGNbm0TT 0jafjsqtKDfxXsz2noWQ6F2i0PkDjxboxI9z2Y//EYuFcmU+5dPtUNpdCpbO6HzzXrJF2n lLeN+AvVYnW7oO3U60gMwHX2XK4wQG10NBAD1UizCCYofT0UwJy09NQRv6GqmlC9KcoTXy XRnn+BOA0Q+9gPBQHPvl1uQxqi3A8rQNn/ClGoWS30h2xummj8C2sJOkrCsopA== 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 4P1wTK2NpVzgRy; Wed, 25 Jan 2023 07:29:41 +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 30P7Tf0I084561; Wed, 25 Jan 2023 07:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30P7TfOQ084560; Wed, 25 Jan 2023 07:29:41 GMT (envelope-from git) Date: Wed, 25 Jan 2023 07:29:41 GMT Message-Id: <202301250729.30P7TfOQ084560@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 0e3053f5885d - main - sysutils/nut_exporter: update to v2.5.2. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e3053f5885dd803f692f16b40af2b237386a5c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e3053f5885dd803f692f16b40af2b237386a5c2 commit 0e3053f5885dd803f692f16b40af2b237386a5c2 Author: Jony Hudson AuthorDate: 2023-01-25 07:29:26 +0000 Commit: Xin LI CommitDate: 2023-01-25 07:29:27 +0000 sysutils/nut_exporter: update to v2.5.2. While there, also make it possible to override --nut.vars_enable. PR: ports/268685 --- sysutils/nut_exporter/Makefile | 3 +-- sysutils/nut_exporter/distinfo | 6 +++--- sysutils/nut_exporter/files/nut_exporter.in | 23 +++++++++-------------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/sysutils/nut_exporter/Makefile b/sysutils/nut_exporter/Makefile index aa8acb2c92c6..244ea0f51744 100644 --- a/sysutils/nut_exporter/Makefile +++ b/sysutils/nut_exporter/Makefile @@ -1,7 +1,6 @@ PORTNAME= nut_exporter DISTVERSIONPREFIX= v -DISTVERSION= 2.5.0 -PORTREVISION= 1 +DISTVERSION= 2.5.2 CATEGORIES= sysutils MAINTAINER= bsd@j-star.org diff --git a/sysutils/nut_exporter/distinfo b/sysutils/nut_exporter/distinfo index 9c15907679fa..da3c2d046f29 100644 --- a/sysutils/nut_exporter/distinfo +++ b/sysutils/nut_exporter/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1671310398 -SHA256 (DRuggeri-nut_exporter-v2.5.0_GH0.tar.gz) = 676591c3ea30dd716aac9697ced083d49f9bc6350cdeeb1e8e03819bebacd8a2 -SIZE (DRuggeri-nut_exporter-v2.5.0_GH0.tar.gz) = 200768 +TIMESTAMP = 1672518974 +SHA256 (DRuggeri-nut_exporter-v2.5.2_GH0.tar.gz) = eb8d7f3b9bbc0c95549d73b81f773eaacf72c81cd8937e0457c6900ef6a82345 +SIZE (DRuggeri-nut_exporter-v2.5.2_GH0.tar.gz) = 201180 SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383 SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e diff --git a/sysutils/nut_exporter/files/nut_exporter.in b/sysutils/nut_exporter/files/nut_exporter.in index ddd72731cf05..8e73e9200108 100644 --- a/sysutils/nut_exporter/files/nut_exporter.in +++ b/sysutils/nut_exporter/files/nut_exporter.in @@ -25,6 +25,9 @@ # nut_exporter_tls_key_file (string): # Path to a file that contains the TLS private key (PEM format). # Default is "". +# nut_exporter_nut_vars_enable (string): +# A comma-separated list of variable names to monitor. +# Default is "" (use built-in default from the binary). . /etc/rc.subr @@ -37,28 +40,20 @@ nut_exporter_enable=${nut_exporter_enable:-"NO"} nut_exporter_listen_address=${nut_exporter_listen_address:-":9199"} nut_exporter_user=${nut_exporter_user:-"www"} nut_exporter_metrics_namespace=${nut_exporter_metrics_namespace:-"network_ups_tools"} +nut_exporter_nut_vars_enable=${nut_exporter_nut_vars_enable:-""} nut_exporter_tls_cert_file=${nut_exporter_tls_cert_file:-""} nut_exporter_tls_key_file=${nut_exporter_tls_key_file:-""} pidfile="/var/run/${name}/${name}.pid" -if [ -z ${nut_exporter_tls_cert_file} ] ; then - cert_arg="" -else - cert_arg="--web.tls.cert_file=${nut_exporter_tls_cert_file}" -fi -if [ -z ${nut_exporter_tls_key_file} ] ; then - key_arg="" -else - key_arg="--web.tls.key_file=${nut_exporter_tls_key_file}" -fi - procname=%%PREFIX%%/bin/nut_exporter command=/usr/sbin/daemon command_args="-p ${pidfile} -t ${name} -T ${name} ${procname} \ - --web.listen-address=${nut_exporter_listen_address} \ - --metrics.namespace=${nut_exporter_metrics_namespace} \ - ${cert_arg} ${key_arg}" + --web.listen-address=${nut_exporter_listen_address} \ + --metrics.namespace=${nut_exporter_metrics_namespace} \ + ${nut_exporter_nut_vars_enable:+--nut.vars_enable=${nut_exporter_nut_vars_enable}} \ + ${nut_exporter_tls_cert_file:+--web.tls.cert_file=${nut_exporter_tls_cert_file}} \ + ${nut_exporter_tls_key_file:+--web.tls.key_file=${nut_exporter_tls_key_file}}" start_precmd=start_precmd start_precmd()