From nobody Fri Feb 17 14:22:53 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 4PJDYT64d3z3qS96; Fri, 17 Feb 2023 14:22:53 +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 4PJDYT48Qbz3CJ7; Fri, 17 Feb 2023 14:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676643773; 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=ZzG1ptnM93aB9Puytuxy9rZncUTzr4alHZhl767tvsI=; b=vfFlhXZxq602AZoNFcWAGiO1734JmHXvGpmQqSRS2KmoXe0PVVtWpMxksWshUbTlEyo+yg sAshv+9cGH3VTxO6MjtjBA5q2mIl8jUjj3QvxB1V1W/1Tydm80+f0mEM/B94Bphm7/VwGh WBUtqzEyTeftiNhKZqtv1KNfQH2nHJaEtt3RuXp4ne3gIVa1Trn3eGlzec5JvLUqMo9uVN qwIEC2t2fko32o69B93D6SYWr+mDYC103plMsC8gMKHBWwdaaBRxmXpH9zrv93F0Fwdeer Mt75h6J59VDkYjcB+ricI469WWqpXOh8uTZTWT/NK0EiGqlW5C+rvw0LSTXdVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676643773; 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=ZzG1ptnM93aB9Puytuxy9rZncUTzr4alHZhl767tvsI=; b=FteB3QnC31XxjYbHwFld/PlsurtdIH82p4e3oO/vgAMRfpbezkihvb0UwEVWfdDDAB09Ix n23TrRCaQkZW3gT3p6hOOULzIG/Y8eFN3h7moW9jAAfo+SE2jxhqD9jCGEbji+bx6dXpDa IoliZGt3izTlJh/3M8KgX0cZn4dpOiHN+Q4l7U1wLGLcwbXqmNMccZlnIl7n1Fkqc3DrZS 204p24LKc8gApulo02P4p8OsGwRLmvX15wdPzKjXK3fZczsZQ8owHuaLmQXtsiUR6kOZK2 Vl298unBISI5RFiIWGUMpCE/Dn18OWsPw2VtvWvYtTARb4Ko9kyzY+iNNwnAPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676643773; a=rsa-sha256; cv=none; b=KRDL8v306Nt+9Lk93P0jW6KZLBhwY5TuW1N9p36ADnNFajh3WIER31GN2/UEOvO9HnYz8e X8ZMIsKs0wY8RD8Iu80IyEiwlGepgTKm1M+ZDSAFiCn9XAJDn4zTtpwoK0tbgZ5a18tbny pX2ZBc+QmySx62YKYO3mvIH5IwlugVB3ufm8683AyNaWQ7b07+EYjmxnIlLF+410QHYrvK o+qAiqHky6l1n1XOcv0+oia+fZRj+1grPFVwAANwjpK+wXsf27GokxqketkuZ3FcXsojIx 1zZL0HDBkO6ju3HLnT8tl0on7oIivPjl3QlPh45b0nAuIdLsG2osxOglZZDS5w== 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 4PJDYT3BgWzm6t; Fri, 17 Feb 2023 14:22:53 +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 31HEMrVl026263; Fri, 17 Feb 2023 14:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HEMrqN026262; Fri, 17 Feb 2023 14:22:53 GMT (envelope-from git) Date: Fri, 17 Feb 2023 14:22:53 GMT Message-Id: <202302171422.31HEMrqN026262@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 52a84b5635bb - main - net-mgmt/icingaweb2-module-vspheredb: allow flags in 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: 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52a84b5635bb75676ed83ffdaf04cf3023705e24 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=52a84b5635bb75676ed83ffdaf04cf3023705e24 commit 52a84b5635bb75676ed83ffdaf04cf3023705e24 Author: Dan Langille AuthorDate: 2023-02-17 14:20:16 +0000 Commit: Dan Langille CommitDate: 2023-02-17 14:22:50 +0000 net-mgmt/icingaweb2-module-vspheredb: allow flags in rc.d script Add vspheredb_flags to rc.d script allowing users to choose which daemon(8) they wish to use. My use case is: vspheredb_flags="-o /var/log/vspheredb.log" Which logs the output of the daemon to the specified file. See man(8) daemon for more information. Approved by: maintainer (via private communication) --- net-mgmt/icingaweb2-module-vspheredb/Makefile | 2 +- net-mgmt/icingaweb2-module-vspheredb/files/vspheredb.in | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net-mgmt/icingaweb2-module-vspheredb/Makefile b/net-mgmt/icingaweb2-module-vspheredb/Makefile index 552b4064b023..38ba5772b43f 100644 --- a/net-mgmt/icingaweb2-module-vspheredb/Makefile +++ b/net-mgmt/icingaweb2-module-vspheredb/Makefile @@ -1,7 +1,7 @@ PORTNAME= icingaweb2-module-vspheredb DISTVERSIONPREFIX= v DISTVERSION= 1.4.0 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= net-mgmt www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/net-mgmt/icingaweb2-module-vspheredb/files/vspheredb.in b/net-mgmt/icingaweb2-module-vspheredb/files/vspheredb.in index 0e122458400b..83b8228b1963 100755 --- a/net-mgmt/icingaweb2-module-vspheredb/files/vspheredb.in +++ b/net-mgmt/icingaweb2-module-vspheredb/files/vspheredb.in @@ -5,10 +5,12 @@ # BEFORE: LOGIN # KEYWORD: shutdown # -# Add the following lines to /etc/rc.conf to enable nsca: +# Add the following lines to /etc/rc.conf to enable vspheredb: # vspheredb (bool): Set to "NO" by default. # Set it to "YES" to enable . # +# vspheredb_flags (string): defaults to -f +# see man(8) daemon for more information . /etc/rc.subr @@ -17,8 +19,10 @@ rcvar=vspheredb_enable pidfile="/var/run/vspheredb.pid" command="/usr/sbin/daemon" -command_args="-f -P ${pidfile} %%PREFIX%%/bin/icingacli vspheredb daemon run" - load_rc_config "${name}" +: ${vspheredb_flags:="-f"} + +command_args="${vspheredb_flags} -P ${pidfile} /usr/local/bin/icingacli vspheredb daemon run" + run_rc_command "$1"