From nobody Wed Jul 13 06:22:51 2022 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 EDB4D1D05A24; Wed, 13 Jul 2022 06:22:51 +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 4LjSGg6JLZz4Jvb; Wed, 13 Jul 2022 06:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657693371; 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=V/TY/8qbSpOPMLctbAN/SvZrVMzsUG2n6MQ5oOtPIpI=; b=M2zMY9+5SgJU2CHzXa1EMTWlxR0G1cfxvXtSN9v9eYXaj4kv8X2vOoyqLh+CbTTDgmdjgI gTu2HbpjJTXiJ1U+5kWye5snoanX6EvWEgfT0mam4crBbbP91VYRkuhsZOtuKN/LwjTJiW OhrwaqPSqe9CjIodLSFbARXisCeeU5X3cAQTtSQPjHlsSDcmE1eNHHFEBWLishrhZgfTFZ 5n0oUMO5euxJx5Y5XcEEWffV9y7TfvLKRaO1iQHjVjEhxaOZM/HM9ZrJy6NVX5j/qZ3IAQ QrrjNVDGbV1w9n1Jd+rbOZQotgRLpOxnBSezpXc+5/Izh8PvgNMdpAoBAkGQ+w== 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 4LjSGg51tqz1C2f; Wed, 13 Jul 2022 06:22:51 +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 26D6MpfQ011604; Wed, 13 Jul 2022 06:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26D6MpMe011603; Wed, 13 Jul 2022 06:22:51 GMT (envelope-from git) Date: Wed, 13 Jul 2022 06:22:51 GMT Message-Id: <202207130622.26D6MpMe011603@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: be1ee3ce8ccf - main - sysutils/py-salt: Respect pid-file parameter and set salt_master_configdir/salt_minion_configdir variables 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: be1ee3ce8ccf59212635c985966c49ed334d1b71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657693371; 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=V/TY/8qbSpOPMLctbAN/SvZrVMzsUG2n6MQ5oOtPIpI=; b=dQMQRmrGQlr+KmHBzrLExNA2AAY4aXCB5Rf+X/r29YufAjDXLh+Mq+fmH4D6kVcPpsXgSI 1yoj2hXUHQkmu3lFxhHmdfu6tPgNlxD7IyRkfD77St7UxG/ZnTIH9Oq6muCTnea3j3IXgD LLPI7GTnNuF6hXau6F/x5L2CewTeWTDjGgQTkoydYniH+3CdIQhcYBYIw0ImjKh0YM8vpy CZM1mHSCkjucsQ6q4LzE65jLO16fKyrH47M0N8IfZoFsZJpT6r67ITQAl7gZi641tfp+3o PeobnW0lkO9UhwQ++nVT3z0c98ACI9iSW4Jb4T2dJOCk/KDQkAlAmar8ho5+VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657693371; a=rsa-sha256; cv=none; b=bZtV0kHP+phviiqFtTiTrrQsbQsbIIhrhFsTKlHKkr6XNGWfX3pXCpaaHTG2Yjc8tBCqt8 LNruTQsO66KEIlRYiu7Mqj3t6nkEpHc3095UWR5PscrYE1dJg949wukfIw28BFrUIpgW+h IDZyI9/idXpw4dWYD20e4Svo54fmKlTpCqedrnZU506pmWsKRJRlF5pBoFxtTTEMdg3QlO kRGs70IUmCK7gdWsb8xLNHWdYShKgYu7TxCoHmGRIjuJYnNe4L+pDvbzi5Um9oP6Sb3r6O B3i63zkafoBTGXyzud18Z2qvtsFePxXPpZfE5skBVOSG7xKow4/s5eugsI2EqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=be1ee3ce8ccf59212635c985966c49ed334d1b71 commit be1ee3ce8ccf59212635c985966c49ed334d1b71 Author: Kirill Ponomarev AuthorDate: 2022-07-13 06:21:12 +0000 Commit: Kirill Ponomarev CommitDate: 2022-07-13 06:21:12 +0000 sysutils/py-salt: Respect pid-file parameter and set salt_master_configdir/salt_minion_configdir variables PR: 265173 Reported by: trix@basement.net --- sysutils/py-salt/Makefile | 1 + sysutils/py-salt/files/salt_master.in | 5 +++-- sysutils/py-salt/files/salt_minion.in | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index c7627f3be5ab..0755fd0ea6b7 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,6 +2,7 @@ PORTNAME= salt PORTVERSION= 3004.2 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/files/salt_master.in b/sysutils/py-salt/files/salt_master.in index 17b7cae6ace8..249c1d735e41 100644 --- a/sysutils/py-salt/files/salt_master.in +++ b/sysutils/py-salt/files/salt_master.in @@ -25,14 +25,15 @@ load_rc_config ${name} : ${salt_master_enable:=NO} : ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin} +: ${salt_master_configdir:=%%PREFIX%%/etc/salt} : ${salt_master_pidfile:=/var/run/salt-master.pid} : ${salt_master_eggcache=/tmp} command="%%PREFIX%%/bin/salt-master" command_interpreter="%%PYTHON_CMD%%" -required_files="%%PREFIX%%/etc/salt" -command_args="-c ${required_files} -d" +required_files=${salt_master_configdir} pidfile=${salt_master_pidfile} +command_args="-c ${required_files} --pid-file=${pidfile} -d" export PATH="${salt_master_paths}" export PYTHON_EGG_CACHE="${salt_master_eggcache}" diff --git a/sysutils/py-salt/files/salt_minion.in b/sysutils/py-salt/files/salt_minion.in index e25a0ecc660d..ff0a70f4c812 100644 --- a/sysutils/py-salt/files/salt_minion.in +++ b/sysutils/py-salt/files/salt_minion.in @@ -25,14 +25,15 @@ load_rc_config ${name} : ${salt_minion_enable:=NO} : ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin} +: ${salt_minion_configdir:=%%PREFIX%%/etc/salt} : ${salt_minion_pidfile:=/var/run/salt-minion.pid} : ${salt_minion_eggcache=/tmp} command="%%PREFIX%%/bin/salt-minion" command_interpreter="%%PYTHON_CMD%%" -required_files="%%PREFIX%%/etc/salt" -command_args="-c ${required_files} -d" +required_files=${salt_minion_configdir} pidfile=${salt_minion_pidfile} +command_args="-c ${required_files} --pid-file=${pidfile} -d" export PATH="${salt_minion_paths}" export PYTHON_EGG_CACHE="${salt_minion_eggcache}"