From owner-svn-ports-all@freebsd.org Sun Feb 19 02:12:11 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93C15CDBEF8; Sun, 19 Feb 2017 02:12:11 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51FF0FEE; Sun, 19 Feb 2017 02:12:11 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1J2CA4c033628; Sun, 19 Feb 2017 02:12:10 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1J2CAML033625; Sun, 19 Feb 2017 02:12:10 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201702190212.v1J2CAML033625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 19 Feb 2017 02:12:10 +0000 (UTC) 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 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2017 02:12:11 -0000 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 (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}"