svn commit: r434287 - in head/sysutils/py-salt: . files

[Brad Davis]

Author: brd
Date: Fri Feb 17 15:59:58 2017
New Revision: 434287
URL: https://svnweb.freebsd.org/changeset/ports/434287

Log:
  sysutils/py-salt:  Teach the Salt master and minion startup scripts to set
  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 at gmail.com> (maintainer),
  		bdrewery (mentor, implicit)

Modified:
  head/sysutils/py-salt/Makefile
  head/sysutils/py-salt/files/salt_master.in
  head/sysutils/py-salt/files/salt_minion.in

Modified: head/sysutils/py-salt/Makefile
==============================================================================
--- head/sysutils/py-salt/Makefile	Fri Feb 17 15:52:16 2017	(r434286)
+++ head/sysutils/py-salt/Makefile	Fri Feb 17 15:59:58 2017	(r434287)
@@ -3,7 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2016.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Modified: head/sysutils/py-salt/files/salt_master.in
==============================================================================
--- head/sysutils/py-salt/files/salt_master.in	Fri Feb 17 15:52:16 2017	(r434286)
+++ head/sysutils/py-salt/files/salt_master.in	Fri Feb 17 15:59:58 2017	(r434287)
@@ -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}"

Modified: head/sysutils/py-salt/files/salt_minion.in
==============================================================================
--- head/sysutils/py-salt/files/salt_minion.in	Fri Feb 17 15:52:16 2017	(r434286)
+++ head/sysutils/py-salt/files/salt_minion.in	Fri Feb 17 15:59:58 2017	(r434287)
@@ -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}"