From nobody Sat May 18 05:18:23 2024 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 4VhBtm0Jn0z5L4p8; Sat, 18 May 2024 05:18:24 +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 4VhBtl6r6Gz48vL; Sat, 18 May 2024 05:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716009504; 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=SUXBnRZfImMqSR5IBV0ehbSRXlY1IZdAawXs5sIjWQk=; b=VoPwIVi/JGXMuUpTbM5gjwilRfu8UmzVJPc4wsOUqhL9W0m8k356kSirqEHAPN35mNUwDV flCWEiCgr+RbNlGRkRXQNvuv+kXaItk62EnOi2Cqx+aYEQ68BKQivXLPKpw5jecErsqewX OH7GGbTcs5OgJ0i1ULkjXg1azjqteuGGdTGD2y73oZtN8neTsD/BMoDJIaVpFSpwtUmTF8 eDpkZBaPnTcagkszhNMgSEJQIOaDdQheI2WyP7tqvAlpCFChY2wm/jFAX2ih6qUOo8xabh sMZR77DRGY0dbctCQUvzIOJ0ct/K7kyo9GN4Mb4xv7Uebsw64oawGnKEHfscyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716009504; a=rsa-sha256; cv=none; b=Pjqcd8waNKevmY5MQRXg8BY5uwbifn/wNrf9RwobUG8Dtfylg2qydPhp4UR69U751jf2WA 62/WeJR+YVqm+U6krhOdpIj2e7JDhGp+fmvTQ4has92vPyYeIN3aRtFBoaIEEaqnfcWgJH Hc1YaCL0iOn+SIiqol8lYHC0cjNkpVIfpT4fNPO1dvloPIJe8PbtLNT5KJYJ7rgyTgyu2K cnDx6UCaslU7Sl6CL/Rao8jEynhSU/NLVPm969ovN7QHp1JThzCA79Da6A9Qg62F1C7Skp x1k9tUF2Ld2A/z0HVYRwTxsw1mnS7CQ6Nsnw5SU88P/6Rv1IBZCb7TLPWtIGKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716009504; 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=SUXBnRZfImMqSR5IBV0ehbSRXlY1IZdAawXs5sIjWQk=; b=xjSGg5hOiotgKkogLOyDdBIZJZrNRw948ZAWIBIclZuyU8SI+r9eswBI65n6vx1BH1ANey C2xQCYKkLgbp3Yt5RHQKVCZaJfnwIRC8EswEVU1chqmKvPLKMWBcW/dl4TOzlY5/th5U4U q82mPl3bZ/uH7T2vBeo2+xz4nazoh1pmTu5gmjyz7whdqGNX3I6jhdvuZnkf1S6xQR7RpA bRcKgF0HIC99rX52wbqv9aMJpM3F3Neer2gbh+Blrak18KiqdB5713i9U7mpbNmmwqUCcm daj7G4pZzufbVGvism6v5isGUpsgFwToeFWgVUBo5BogycydVWAUk7tar05GhA== 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 4VhBtl69L5z1C09; Sat, 18 May 2024 05:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44I5IN7L085553; Sat, 18 May 2024 05:18:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44I5INVd085550; Sat, 18 May 2024 05:18:23 GMT (envelope-from git) Date: Sat, 18 May 2024 05:18:23 GMT Message-Id: <202405180518.44I5INVd085550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 9ae1e22950e7 - main - net-mgmt/metronome: Add rc.d script 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ae1e22950e7c9114e6d0946855de4f6992ac3b4 Auto-Submitted: auto-generated The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ae1e22950e7c9114e6d0946855de4f6992ac3b4 commit 9ae1e22950e7c9114e6d0946855de4f6992ac3b4 Author: Kirill Ponomarev AuthorDate: 2024-05-18 05:15:28 +0000 Commit: Kirill Ponomarev CommitDate: 2024-05-18 05:17:59 +0000 net-mgmt/metronome: Add rc.d script PR: 239819 Reported by: freebsd_at_dns_d_company, tremere_at_cainites_d_net --- GIDs | 2 +- UIDs | 2 +- net-mgmt/metronome/Makefile | 18 ++++++++++++++++-- net-mgmt/metronome/files/metronome.in | 35 +++++++++++++++++++++++++++++++++++ net-mgmt/metronome/pkg-plist | 1 + 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/GIDs b/GIDs index ea5e397c234b..a68dfd3cc521 100644 --- a/GIDs +++ b/GIDs @@ -285,7 +285,7 @@ stunnel:*:341: openfire:*:342: gunicorn:*:343: snmpd:*:344: -# free: 345 +_metronome:*:345: # free: 346 eturnal:*:347: # free: 348 diff --git a/UIDs b/UIDs index ceba79b7c0fc..7c31a52724e7 100644 --- a/UIDs +++ b/UIDs @@ -290,7 +290,7 @@ stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin openfire:*:342:342::0:0:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin gunicorn:*:343:343::0:0:Gunicorn Daemon:/nonexistent:/usr/sbin/nologin snmpd:*:344:344::0:0:Net-SNMP Daemon:/nonexistent:/usr/sbin/nologin -# free: 345 +_metronome:*:345:345::0:0:Metronome Daemon:/nonexistent:/usr/sbin/nologin # free: 346 eturnal:*:347:347::0:0:eturnal User:/var/spool/eturnal:/bin/sh # free: 348 diff --git a/net-mgmt/metronome/Makefile b/net-mgmt/metronome/Makefile index 0d4370239897..f42f4d0bfad8 100644 --- a/net-mgmt/metronome/Makefile +++ b/net-mgmt/metronome/Makefile @@ -1,6 +1,6 @@ PORTNAME= metronome DISTVERSION= 0.9.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= net-mgmt dns MAINTAINER= krion@FreeBSD.org @@ -13,21 +13,35 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_thread.so:devel/boost-libs USES= autoreconf:build compiler:c++11-lang eigen:3 libtool:build \ - localbase:ldflags pathfix pkgconfig + localbase:ldflags pathfix pkgconfig USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= ahupowerdns USE_LDCONFIG= yes +USE_RC_SUBR= metronome GNU_CONFIGURE= yes INSTALL_TARGET= install-strip SUB_FILES= pkg-message +SUB_LIST+= METRONOME_DBDIR=${METRONOME_DBDIR} \ + METRONOME_USER=${METRONOME_USER} +METRONOME_USER?= _metronome +USERS= ${METRONOME_USER} +GROUPS= ${METRONOME_USER} + +PLIST_SUB+= METRONOME_DBDIR=${METRONOME_DBDIR} \ + METRONOME_USER=${METRONOME_USER} OPTIONS_DEFINE= DOCS +METRONOME_DBDIR?= /var/db/metronome + pre-configure: (cd ${WRKSRC}; ./bootstrap ) +post-install: + ${MKDIR} ${STAGEDIR}${METRONOME_DBDIR} + .include diff --git a/net-mgmt/metronome/files/metronome.in b/net-mgmt/metronome/files/metronome.in new file mode 100644 index 000000000000..d402442033a7 --- /dev/null +++ b/net-mgmt/metronome/files/metronome.in @@ -0,0 +1,35 @@ +#!/bin/sh + +# PROVIDE: metronome +# REQUIRE: DAEMON SERVERS +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable metronome: +# +# metronome_enable="YES" +# +# The next lines are optional since they have defaults +# +# metronome_carbonaddress="" +# metronome_wsaddress="" +# metronome_statsdir="" +# + +. /etc/rc.subr + +name=metronome +rcvar=${name}_enable + +load_rc_config ${name} +: ${metronome_enable:=NO} +: ${metronome_carbonaddress:=127.0.0.1:2003} +: ${metronome_wsaddress:=127.0.0.1:8000} +: ${metronome_statsdir:=%%METRONOME_DBDIR%%} + +pidfile=/var/run/${name}.pid +actual_command="%%PREFIX%%/bin/${name} --daemon 0 --carbon-address ${metronome_carbonaddress} --webserver-address ${metronome_wsaddress} --stats-directory ${metronome_statsdir}" +command=/usr/sbin/daemon +command_args="-c -f -r -u %%METRONOME_USER%% -P ${pidfile} -- ${actual_command}" + +run_rc_command "$1" diff --git a/net-mgmt/metronome/pkg-plist b/net-mgmt/metronome/pkg-plist index 23b0c9115efc..b854edfbdb9b 100644 --- a/net-mgmt/metronome/pkg-plist +++ b/net-mgmt/metronome/pkg-plist @@ -18,3 +18,4 @@ bin/msubmit %%DATADIR%%/html/legend.css %%DATADIR%%/html/lines.css %%DATADIR%%/html/local.js +@dir(%%METRONOME_USER%%, %%METRONOME_USER%%, ) %%METRONOME_DBDIR%%