From nobody Fri Nov 15 08:08:09 2024 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 4XqV555qXSz5cpCR; Fri, 15 Nov 2024 08:08:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqV5552QHz47Xj; Fri, 15 Nov 2024 08:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731658089; 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=g8A2RiQpa+/kgMyGvM7Wl2Q8F7L4jarGHNZWFm/7jzg=; b=HofXVhBBaK2Y6e5LC3UroZj5Ekk2i/zaNzKREcwRcBRbuwQjgc0Kd8FDR+A8xIwB8eb4s/ Ceu2PzCczVr/WzfVW49n9kcLMZ+NNgUDVQ3UCirdihM0fO2Eo0LkFF+b686jE35aP187Hm GsaFoHSwZAFaITVWpdo+27q5G3ryN3yh55lZL/ZooB59CH49N8HHF6cbgOZb+F31ZlWw/D wlbK/SvNhTc/H2jrL6Ca9EtweK1SOhxxiUPQ433T7rCsCmlR7ONcYOk1fz+dOKJZ7PtkA5 84/9bVt0ZUDb+zPSGiVCemFzieOY6FEQR/91B/v6gn1qgWco+vO+boeqXH/pFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731658089; 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=g8A2RiQpa+/kgMyGvM7Wl2Q8F7L4jarGHNZWFm/7jzg=; b=PLCvmqGUSrG58wyyCogOmqaag80v+TCUxzmkmyfBzW+Lal5OC6tsMRYlCx97vlfgtYilEF J1fm2xhOxvG+/VBSKzaTxPZLbKvPPtJz8SDYpU5KHUcmk1CA1TOXwXyy1bY2Z58/aM9Dei bmIjnN8182RQmTvcIOmwCX3zl44RuWV2+1WB/ZUVb+E5dOyJP70rQ4NHLeh7GwuNMpwmZ9 GnQA//TLt+jyys34ohzYtk3oqU0vanUrOw4+HpEC+0tg/sC+QasCy1d6sV4/GUsdOn9k8m qBT4+tEZ9t2Xq4SW6V4GWBSgbxIeoUrViSBb/n7iCpSZETYs1DaATw6hiQCnzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731658089; a=rsa-sha256; cv=none; b=gWS+gMPw9zl8llSSA0D4nDK3HJ7D+mjt7LzINbczByOsvcnY7KAW5fhfGAvGRTgSYLSP3g 6jUSaJ3W7ZQtok4FKaJEP0RUrorpwmxcJXMp2vwaAdR4aad1yCH0jGaXPnGCxVhk03luER 7+vyIb6oS0OaPNNGxZE7AABmvl/0HWnCAVu05D5tqAu9A9bTzYC1f6Z3P/KmyZcwAy7EBO VLwN0Huqijc/lkh7r926gGVM7C0pVI+gw++rb+UVw6GdP5DSD7YmX6fn4KvsZjU9L1kLGL vHSsG1aLYeRRfMsbhcShHrNsNoRNeW7Yomyh93+s9wyVOIhqP6YfObvJkJXu8A== 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 4XqV554bRYzFCf; Fri, 15 Nov 2024 08:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AF889ii016899; Fri, 15 Nov 2024 08:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AF889MW016896; Fri, 15 Nov 2024 08:08:09 GMT (envelope-from git) Date: Fri, 15 Nov 2024 08:08:09 GMT Message-Id: <202411150808.4AF889MW016896@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7fa147cba36f - main - net-mgmt/mqtt2prometheus: Update to 0.1.7 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fa147cba36f014832cebf9e1aee7e03786d4ddf Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fa147cba36f014832cebf9e1aee7e03786d4ddf commit 7fa147cba36f014832cebf9e1aee7e03786d4ddf Author: Emmanuel Vadot AuthorDate: 2024-11-15 07:24:48 +0000 Commit: Emmanuel Vadot CommitDate: 2024-11-15 08:07:49 +0000 net-mgmt/mqtt2prometheus: Update to 0.1.7 While here add a rc.d script. --- net-mgmt/mqtt2prometheus/Makefile | 4 +- net-mgmt/mqtt2prometheus/distinfo | 6 +- net-mgmt/mqtt2prometheus/files/mqtt2prometheus | 80 ++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/net-mgmt/mqtt2prometheus/Makefile b/net-mgmt/mqtt2prometheus/Makefile index cabd88dcea86..1c10b8c0a6c5 100644 --- a/net-mgmt/mqtt2prometheus/Makefile +++ b/net-mgmt/mqtt2prometheus/Makefile @@ -1,7 +1,6 @@ PORTNAME= mqtt2prometheus DISTVERSIONPREFIX= v -DISTVERSION= 0.1.6 -PORTREVISION= 22 +DISTVERSION= 0.1.7 CATEGORIES= net-mgmt MAINTAINER= manu@FreeBSD.org @@ -55,5 +54,6 @@ post-extract: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mqtt2prometheus/ ${INSTALL_DATA} ${WRKSRC}/config.yaml.dist ${STAGEDIR}${PREFIX}/etc/mqtt2prometheus/ + ${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d .include diff --git a/net-mgmt/mqtt2prometheus/distinfo b/net-mgmt/mqtt2prometheus/distinfo index d2086341d835..5ef24a4272b8 100644 --- a/net-mgmt/mqtt2prometheus/distinfo +++ b/net-mgmt/mqtt2prometheus/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1679877009 -SHA256 (hikhvar-mqtt2prometheus-v0.1.6_GH0.tar.gz) = 61b046469b76411641d4fcb4d56ac29b4e86b4374111da60b988de91267df848 -SIZE (hikhvar-mqtt2prometheus-v0.1.6_GH0.tar.gz) = 59608 +TIMESTAMP = 1731654699 +SHA256 (hikhvar-mqtt2prometheus-v0.1.7_GH0.tar.gz) = 77e59fc04a522bcf08d8380a75021f5cda008067e50435dbe24b4c85155c20fc +SIZE (hikhvar-mqtt2prometheus-v0.1.7_GH0.tar.gz) = 69807 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (eclipse-paho.mqtt.golang-v1.3.5_GH0.tar.gz) = 9cfb8872e5f6347ec5e669791f28339a9f404f65ec7ad6bee341ce5b399065b9 diff --git a/net-mgmt/mqtt2prometheus/files/mqtt2prometheus b/net-mgmt/mqtt2prometheus/files/mqtt2prometheus new file mode 100755 index 000000000000..919239b8908a --- /dev/null +++ b/net-mgmt/mqtt2prometheus/files/mqtt2prometheus @@ -0,0 +1,80 @@ +#!/bin/sh + +# PROVIDE: mqtt2prometheus +# REQUIRE: DAEMON +# KEYWORD: shutdown + +# This script supports running multiple instances of mqtt2prometheus. +# To run additional instances link this script to something like +# % ln -s mqtt2prometheus mqtt2prometheus_foo +# and define additional mqtt2prometheus_foo_* variables in one of +# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/mqtt2prometheus_foo + +. /etc/rc.subr + +name="${file}" + +case "$0" in +/etc/rc*) + name="$_file" + ;; +*/service) + ;; +*) + name="$0" + ;; +esac + +name="${name:-mqtt2prometheus}" ; +name="${name##*/}" +rcvar=${name}_enable + +load_rc_config $name + +eval ": \${${name}_enable:=\"NO\"}" +eval ": \${${name}_user:=\"nobody\"}" +eval ": \${${name}_group:=\"nobody\"}" +eval ": \${${name}_config:=\"/usr/local/etc/mqtt2prometheus.yaml\"}" +eval ": \${${name}_pidfile:=\"/var/run/mqtt2prometheus.pid\"}" +eval ": \${${name}_listen_address:=\"0.0.0.0\"}" +eval ": \${${name}_listen_port:=\"9641\"}" +eval ": \${${name}_loglevel:=\"info\"}" +eval ": \${${name}_logformat:=\"console\"}" +eval ": \${${name}_logfile:=\"/var/log/mqtt2prometheus.log\"}" + +pidfile="$(eval echo \${${name}_pidfile})" +required_files="$(eval echo \${${name}_config})" +m2p_user="$(eval echo \${${name}_user})" +m2p_group="$(eval echo \${${name}_group})" +m2p_config="$(eval echo \${${name}_config})" +m2p_listen_address="$(eval echo \${${name}_listen_address})" +m2p_listen_port="$(eval echo \${${name}_listen_port})" +m2p_loglevel="$(eval echo \${${name}_loglevel})" +m2p_logformat="$(eval echo \${${name}_logformat})" +m2p_logfile="$(eval echo \${${name}_logfile})" + +procname="/usr/local/bin/mqtt2prometheus" +command="/usr/sbin/daemon" +command_args="-p ${pidfile} -t ${name} -o ${m2p_logfile} \ + /usr/bin/env ${mqtt2prometheus_env} ${procname} \ + -config ${m2p_config} \ + -listen-address ${m2p_listen_address} \ + -listen-port ${m2p_listen_port} \ + --log-level ${m2p_loglevel} \ + --log-format ${m2p_logformat} \ + ${mqtt2prometheus_args}" + +start_precmd="mqtt2prometheus_start_precmd" + +mqtt2prometheus_start_precmd() +{ + if [ ! -e "${pidfile}" ]; then + install -m 0600 -o ${m2p_user} -g ${m2p_group} /dev/null "${pidfile}" + fi + + if [ ! -e "${mqtt2prometheus_logfile}" ]; then + install -m 0600 -o ${m2p_user} -g ${m2p_group} /dev/null "${m2p_logfile}" + fi +} + +run_rc_command "$1"