kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysutils/py-salt: Respect pid-file parameter and set salt_master_configdir/salt_minion_configdir variables

Browse source 
PR:		265173
Reported by:	trix@basement.net
This commit is contained in:
Kirill Ponomarev 2022-07-13 08:21:12 +02:00
parent e8c21c2cd6
commit be1ee3ce8c
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysutils/py-salt/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= salt
PORTVERSION= 3004.2
PORTREVISION= 1
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

5
sysutils/py-salt/files/salt_master.in
View file

@ -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}"

5
sysutils/py-salt/files/salt_minion.in
View file

@ -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}"