git: 91d16fcee949 - 2022Q3 - sysutils/py-salt: Respect pid-file parameter and set salt_master_configdir/salt_minion_configdir variables

The branch 2022Q3 has been updated by krion:

URL: https://cgit.FreeBSD.org/ports/commit/?id=91d16fcee9492d841b65c03223f730c80c44d03e

commit 91d16fcee9492d841b65c03223f730c80c44d03e
Author:     Kirill Ponomarev <krion@FreeBSD.org>
AuthorDate: 2022-07-13 06:21:12 +0000
Commit:     Kirill Ponomarev <krion@FreeBSD.org>
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}"