sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/py-salt: Teach the Salt master and minion startup scripts to set

Browse source 
pidfile=.

On a restart this will cause the rc framework to wait for the processes to
exit before trying to start, instead of failing to start because the previous
processes have not gone away yet.

PR:		217154
Approved by:	Christer Edwards <christer.edwards@gmail.com> (maintainer),
		bdrewery (mentor, implicit)
This commit is contained in:
Brad Davis 2017-02-17 15:59:58 +00:00
parent 211101f784
commit 7472c5e220
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=434287
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/py-salt/Makefile
View file

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

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

@ -27,12 +27,14 @@ load_rc_config ${name}
: ${salt_master_enable:=NO}
: ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
: ${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"
pidfile=${salt_master_pidfile}
export PATH="${salt_master_paths}"
export PYTHON_EGG_CACHE="${salt_master_eggcache}"

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

@ -27,12 +27,14 @@ load_rc_config ${name}
: ${salt_minion_enable:=NO}
: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
: ${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"
pidfile=${salt_minion_pidfile}
export PATH="${salt_minion_paths}"
export PYTHON_EGG_CACHE="${salt_minion_eggcache}"