Date: Sun, 19 Feb 2017 02:12:10 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r434392 - in branches/2017Q1/sysutils/py-salt: . files Message-ID: <201702190212.v1J2CAML033625@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Sun Feb 19 02:12:09 2017 New Revision: 434392 URL: https://svnweb.freebsd.org/changeset/ports/434392 Log: MFH: r434287 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@gmail.com> (maintainer), bdrewery (mentor, implicit) Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/sysutils/py-salt/Makefile branches/2017Q1/sysutils/py-salt/files/salt_master.in branches/2017Q1/sysutils/py-salt/files/salt_minion.in Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/py-salt/Makefile ============================================================================== --- branches/2017Q1/sysutils/py-salt/Makefile Sat Feb 18 22:28:49 2017 (r434391) +++ branches/2017Q1/sysutils/py-salt/Makefile Sun Feb 19 02:12:09 2017 (r434392) @@ -3,7 +3,7 @@ PORTNAME= salt PORTVERSION= 2016.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2017Q1/sysutils/py-salt/files/salt_master.in ============================================================================== --- branches/2017Q1/sysutils/py-salt/files/salt_master.in Sat Feb 18 22:28:49 2017 (r434391) +++ branches/2017Q1/sysutils/py-salt/files/salt_master.in Sun Feb 19 02:12:09 2017 (r434392) @@ -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: branches/2017Q1/sysutils/py-salt/files/salt_minion.in ============================================================================== --- branches/2017Q1/sysutils/py-salt/files/salt_minion.in Sat Feb 18 22:28:49 2017 (r434391) +++ branches/2017Q1/sysutils/py-salt/files/salt_minion.in Sun Feb 19 02:12:09 2017 (r434392) @@ -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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702190212.v1J2CAML033625>