From nobody Wed Jul 13 06:23:25 2022 X-Original-To: dev-commits-ports-branches@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 8AE4E1D05C05; Wed, 13 Jul 2022 06:23:25 +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 4LjSHK20Zgz4K8b; Wed, 13 Jul 2022 06:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657693405; 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=aposwwoHxKq1VFtsJDIr36q+p4R8wpIaFR/blhuHEGA=; b=W+jQ+bGa7Mhflo+bbW+THoanudUDoEUTGWMw2lSsLvCkwZM4u+JslXRSHcwbkr49yZ7f2F pkDWqbFeVOV5bhR567Qn4az75EsYRaQgT7xzmGjwqYvCGFjoPAt09zhVR4/SPuzBhjq2El sXYS5BMpjl9Lr0bN3hETuPAoxg8Y378i56a/HEaT9xTS460SpkPm+02Hv1at20ejGZ/YNy m8hQ7EHhcccuk+MZC1piLY4ARnnx/S6TPLIjnngfCgQBRXtiDG5DmsBE2OeijZLFlm8T9d FMEnrqOt8AiCV/Lmlpg7RKolxA0WaFC1nBUGFAjcrX4Tg7SxxwSmAXbiHzuuhQ== 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 4LjSHK0jpLz1Csp; Wed, 13 Jul 2022 06:23:25 +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 26D6NPON011770; Wed, 13 Jul 2022 06:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26D6NO4u011769; Wed, 13 Jul 2022 06:23:25 GMT (envelope-from git) Date: Wed, 13 Jul 2022 06:23:25 GMT Message-Id: <202207130623.26D6NO4u011769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: 91d16fcee949 - 2022Q3 - sysutils/py-salt: Respect pid-file parameter and set salt_master_configdir/salt_minion_configdir variables List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 91d16fcee9492d841b65c03223f730c80c44d03e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657693405; 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=aposwwoHxKq1VFtsJDIr36q+p4R8wpIaFR/blhuHEGA=; b=FC1w+VUqfEPI7FSV5zCYAp8iUwc5Qy7aHDoM2NqlYsu1lf2qM7xv18gf64D53gSuI5SZxU gxIgBwtPQ4qOmwox6x5bOvaqM/IT4waUWTnLyKqixm2iPxaDqfL8SmwUIRzrKjJZ1JJ+oP /TyWjLWsiN1jj578kQ+oOi2Y6cwJ6eFR0rhV/cYiDzTkgL2CUVojaaOnkLSSnBeX3XHOd2 1JwJJdJrJukcDtAXJIYCGD6GhM5e5zZl+8ai834X0wA+kH9f09RGqbObbtC8V5QkGEE+wA Emu30cyuCOdh3eyomiZV6F03C1PsAxoyOjtEvEaEx9wTnspZllFu90SKVkUarQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657693405; a=rsa-sha256; cv=none; b=jSXUFMftwB9t1H8HPOpj+FanJ3VCHh3U3jJmk5MSIcSDq+YZQnw4wOGU42pIhE7UqxBTXV Hl3tPgWHcCSLD+1ty1e6Bq9GSfoauAgKlxPXgI9B0IO4ORuEd3V4ays4YfU1XQCAA/g3Th rw805rcYi2qoQ0OvTYI28YiXSbT6r2PtrE9pN7b8pnKernKluFyhoIEuuZ2B033afIbh1F 7rVhy2y7wDZ/G0WpY2znW6tGoTG5lLjCv3GKlbPnS7mg8tpAtPrpxv1flKypbk8pGZw2oA in+7cxsSymBOdE4wFXvO0JZxeEc6agts12mYxGwyOh2HlF5/k+OrqAtRk45OmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=91d16fcee9492d841b65c03223f730c80c44d03e commit 91d16fcee9492d841b65c03223f730c80c44d03e Author: Kirill Ponomarev AuthorDate: 2022-07-13 06:21:12 +0000 Commit: Kirill Ponomarev CommitDate: 2022-07-13 06:23:21 +0000 sysutils/py-salt: Respect pid-file parameter and set salt_master_configdir/salt_minion_configdir variables PR: 265173 Reported by: trix@basement.net (cherry picked from commit be1ee3ce8ccf59212635c985966c49ed334d1b71) --- 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}"