aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJony Hudson <jonyepsilon@google.com>2023-01-25 07:29:26 +0000
committerXin LI <delphij@FreeBSD.org>2023-01-25 07:29:27 +0000
commit0e3053f5885dd803f692f16b40af2b237386a5c2 (patch)
tree33fd635f4eec4eb53211b2499b1184efce4a3943
parent6b1fd03001eb11c8477675e6fd5c9506c2492879 (diff)
downloadports-0e3053f5885dd803f692f16b40af2b237386a5c2.tar.gz
ports-0e3053f5885dd803f692f16b40af2b237386a5c2.zip
sysutils/nut_exporter: update to v2.5.2.
While there, also make it possible to override --nut.vars_enable. PR: ports/268685
-rw-r--r--sysutils/nut_exporter/Makefile3
-rw-r--r--sysutils/nut_exporter/distinfo6
-rw-r--r--sysutils/nut_exporter/files/nut_exporter.in23
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()