Attachment #160250 for bug #202417

View | Details | Raw Unified | Return to bug 202417
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= salt	4	PORTNAME= salt
5	PORTVERSION= 2015.5.3	5	PORTVERSION= 2015.5.4
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 55-61 Link Here
55	--salt-logs-dir=/var/log/salt \	55	--salt-logs-dir=/var/log/salt \
56	--salt-pidfile-dir=/var/run	56	--salt-pidfile-dir=/var/run
57		57
58	USE_RC_SUBR= salt_master \	58	USE_RC_SUBR= salt_api \
		59	salt_master \
59	salt_minion \	60	salt_minion \
60	salt_syndic	61	salt_syndic
61		62

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (salt-2015.5.3.tar.gz) = f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853	1	SHA256 (salt-2015.5.4.tar.gz) = 4bd890f6da8f6bfb6913aa59932cfa1a1beb1b04f7abc148a4f272493135b85f
2	SIZE (salt-2015.5.3.tar.gz) = 5389038	2	SIZE (salt-2015.5.4.tar.gz) = 5520712




#!/bin/sh

# $FreeBSD$
#
# Salt API startup script
#
# PROVIDE: salt_api
# REQUIRE: LOGIN
# KEYWORD: shutdown

# Add the following to /etc/rc.conf[.local] to enable this service
#
# salt_api_enable="YES"
#

. /etc/rc.subr

name="salt_api"
rcvar=salt_api_enable

load_rc_config ${name}

: ${salt_api_enable:="NO"}

command="%%PREFIX%%/bin/salt-api"
command_interpreter="%%PYTHON_CMD%%"
required_files="%%PREFIX%%/etc/salt"
command_args="-c ${required_files} -d"

run_rc_command "$1"

Return to bug 202417

Line 0 Link Here

(-)files/salt_api.in (+30 lines)
	1	#!/bin/sh
	2
	3	# $FreeBSD$
	4	#
	5	# Salt API startup script
	6	#
	7	# PROVIDE: salt_api
	8	# REQUIRE: LOGIN
	9	# KEYWORD: shutdown
	10
	11	# Add the following to /etc/rc.conf[.local] to enable this service
	12	#
	13	# salt_api_enable="YES"
	14	#
	15
	16	. /etc/rc.subr
	17
	18	name="salt_api"
	19	rcvar=salt_api_enable
	20
	21	load_rc_config ${name}
	22
	23	: ${salt_api_enable:="NO"}
	24
	25	command="%%PREFIX%%/bin/salt-api"
	26	command_interpreter="%%PYTHON_CMD%%"
	27	required_files="%%PREFIX%%/etc/salt"
	28	command_args="-c ${required_files} -d"
	29
	30	run_rc_command "$1"

Lines 162-167 Link Here

(-)pkg-plist (+6 lines)
162	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.pyc	162	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer.pyc
163	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.py	163	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.py
164	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.pyc	164	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/softlayer_hw.pyc
		165	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vmware.py
		166	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vmware.pyc
165	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.py	167	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.py
166	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.pyc	168	%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/vsphere.pyc
167	%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch-git.sh	169	%%PYTHON_SITELIBDIR%%/salt/cloud/deploy/Arch-git.sh
Lines 783-788 Link Here
783	%%PYTHON_SITELIBDIR%%/salt/modules/system.pyc	785	%%PYTHON_SITELIBDIR%%/salt/modules/system.pyc
784	%%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py	786	%%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py
785	%%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc	787	%%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc
		788	%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.py
		789	%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.pyc
786	%%PYTHON_SITELIBDIR%%/salt/modules/systemd.py	790	%%PYTHON_SITELIBDIR%%/salt/modules/systemd.py
787	%%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc	791	%%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc
788	%%PYTHON_SITELIBDIR%%/salt/modules/test.py	792	%%PYTHON_SITELIBDIR%%/salt/modules/test.py
Lines 1651-1656 Link Here
1651	%%PYTHON_SITELIBDIR%%/salt/utils/thin.pyc	1655	%%PYTHON_SITELIBDIR%%/salt/utils/thin.pyc
1652	%%PYTHON_SITELIBDIR%%/salt/utils/timed_subprocess.py	1656	%%PYTHON_SITELIBDIR%%/salt/utils/timed_subprocess.py
1653	%%PYTHON_SITELIBDIR%%/salt/utils/timed_subprocess.pyc	1657	%%PYTHON_SITELIBDIR%%/salt/utils/timed_subprocess.pyc
		1658	%%PYTHON_SITELIBDIR%%/salt/utils/url.py
		1659	%%PYTHON_SITELIBDIR%%/salt/utils/url.pyc
1654	%%PYTHON_SITELIBDIR%%/salt/utils/validate/__init__.py	1660	%%PYTHON_SITELIBDIR%%/salt/utils/validate/__init__.py
1655	%%PYTHON_SITELIBDIR%%/salt/utils/validate/__init__.pyc	1661	%%PYTHON_SITELIBDIR%%/salt/utils/validate/__init__.pyc
1656	%%PYTHON_SITELIBDIR%%/salt/utils/validate/net.py	1662	%%PYTHON_SITELIBDIR%%/salt/utils/validate/net.py