Attachment #161452 for bug #203262

Lines 3-8 Link Here

(-)Makefile (-1 / +4 lines)
3		3
4	PORTNAME= salt	4	PORTNAME= salt
5	PORTVERSION= 2015.8.0	5	PORTVERSION= 2015.8.0
		6	PORTREVISION= 1
6	CATEGORIES= sysutils python	7	CATEGORIES= sysutils python
7	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 56-62 Link Here
56	--salt-logs-dir=/var/log/salt \	57	--salt-logs-dir=/var/log/salt \
57	--salt-pidfile-dir=/var/run	58	--salt-pidfile-dir=/var/run
58		59
59	USE_RC_SUBR= salt_master \	60	USE_RC_SUBR= salt_api \
		61	salt_proxy \
		62	salt_master \
60	salt_minion \	63	salt_minion \
61	salt_syndic	64	salt_syndic
62		65

Lines 15-19 Link Here

(-)files/pkg-message.in (+8 lines)
15	o Update 'master: salt' to point to your Salt Master's hostname or IP	15	o Update 'master: salt' to point to your Salt Master's hostname or IP
16	o sysrc salt_minion_enable="YES"	16	o sysrc salt_minion_enable="YES"
17		17
		18	---------------------------------------------------------------------------------------------------
		19
		20	To configure a Salt Proxy Minion, do the following:
		21
		22	o sysrc salt_proxy_enable="YES"
		23	o sysrc salt_proxy_list=""
		24	o Update the salt_proxy_list with the proxy minion name(s)
		25
18	===================================================================================================	26	===================================================================================================
19		27





# Add the following to /etc/rc.conf[.local] to enable this service
#
# salt_api_enable (bool):          Set to NO by default.
#               Set it to YES to enable salt_api
#

. /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%%"

Lines 10-26 Link Here

(-)files/salt_master.in (-3 / +13 lines)
10		10
11	# Add the following to /etc/rc.conf[.local] to enable this service	11	# Add the following to /etc/rc.conf[.local] to enable this service
12	#	12	#
13	# salt_master_enable="YES"	13	# salt_master_enable (bool): Set to NO by default.
		14	# Set it to YES to enable salt_master.
		15	# salt_master_paths (string): Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
		16	# Default $PATH for salt_master.
		17	# salt_master_eggcache (string): Set to "/tmp" by default.
		18	# Allows defining egg cache directory to fix runtime on diskless systems.
14	#	19	#
15		20
16	. /etc/rc.subr	21	. /etc/rc.subr
17		22
18	name="salt_master"	23	name=salt_master
19	rcvar=salt_master_enable	24	rcvar=salt_master_enable
20		25
21	load_rc_config ${name}	26	load_rc_config ${name}
22		27
23	: ${salt_master_enable:="NO"}	28	: ${salt_master_enable:=NO}
		29	: ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
		30	: ${salt_master_eggcache=/tmp}
24		31
25	command="%%PREFIX%%/bin/salt-master"	32	command="%%PREFIX%%/bin/salt-master"
26	command_interpreter="%%PYTHON_CMD%%"	33	command_interpreter="%%PYTHON_CMD%%"
Lines 27-30 Link Here
27	required_files="%%PREFIX%%/etc/salt"	34	required_files="%%PREFIX%%/etc/salt"
28	command_args="-c ${required_files} -d"	35	command_args="-c ${required_files} -d"
29		36
		37	export PATH="${salt_master_paths}"
		38	export PYTHON_EGG_CACHE="${salt_master_eggcache}"
		39
30	run_rc_command "$1"	40	run_rc_command "$1"





# Add the following to /etc/rc.conf[.local] to enable this service
#
# salt_minion_enable (bool):       Set to NO by default.
#               Set it to YES to enable salt_minion
# salt_minion_paths (string):      Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
#               Default $PATH for salt_minion
# salt_minion_eggcache (string):   Set to "/tmp" by default.
#               Allows defining egg cache directory to fix runtime on diskless systems.
#

. /etc/rc.subr

name=salt_minion
rcvar=salt_minion_enable

load_rc_config ${name}

: ${salt_minion_enable:=NO}
: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
: ${salt_minion_eggcache=/tmp}

command="%%PREFIX%%/bin/salt-minion"
command_interpreter="%%PYTHON_CMD%%"




#!/bin/sh

# $FreeBSD$
#
# Salt Proxy startup script
#
# PROVIDE: salt_proxy
# REQUIRE: LOGIN
# KEYWORD: shutdown

# Add the following to /etc/rc.conf[.local] to enable this service
#
# salt_proxy_enable (bool):        Set to NO by default.
#               Set it to YES to enable salt_proxy.
# salt_proxy_paths (string):       Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
#               Default $PATH for Salt
# salt_proxy_eggcache (string):    Set to "/tmp" by default.
#               Allows defining egg cache directory to fix runtime on diskless systems.
# salt_proxy_list (string):        Set to "" by default.
#               Space separated list of proxies.
#

. /etc/rc.subr

name=salt_proxy
rcvar=salt_proxy_enable

load_rc_config ${name}

: ${salt_proxy_enable:=NO}
: ${salt_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
: ${salt_proxy_eggcache=/tmp}

start_cmd=salt_proxy_start

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

export PATH="${salt_minion_paths}"
export PYTHON_EGG_CACHE="${salt_minion_eggcache}"

salt_proxy_start()
{
    if [ -n "${salt_proxy_list}" ]; then
        echo "${salt_proxy_list} is undefined"
        return 1
    fi

    local _proxy

    for _proxy in ${salt_proxy_list}; do
        echo "Starting salt-proxy: ${_proxy}"
        ${command_interpreter} ${command} --proxyid ${_proxy} ${command_args}
    done
}

run_rc_command "$1"





# Add the following to /etc/rc.conf[.local] to enable this service
#
# salt_syndic_enable (bool):       Set to NO by default.
#               Set it to YES to enable salt_syndic
#

. /etc/rc.subr

name=salt_syndic
rcvar=salt_syndic_enable

load_rc_config ${name}

: ${salt_syndic_enable:=NO}

command="%%PREFIX%%/bin/salt-syndic"
command_interpreter="%%PYTHON_CMD%%"

Return to bug 203262

Lines 10-26 Link Here

(-)files/salt_api.in (-3 / +4 lines)
10		10
11	# Add the following to /etc/rc.conf[.local] to enable this service	11	# Add the following to /etc/rc.conf[.local] to enable this service
12	#	12	#
13	# salt_api_enable="YES"	13	# salt_api_enable (bool): Set to NO by default.
		14	# Set it to YES to enable salt_api
14	#	15	#
15		16
16	. /etc/rc.subr	17	. /etc/rc.subr
17		18
18	name="salt_api"	19	name=salt_api
19	rcvar=salt_api_enable	20	rcvar=salt_api_enable
20		21
21	load_rc_config ${name}	22	load_rc_config ${name}
22		23
23	: ${salt_api_enable:="NO"}	24	: ${salt_api_enable:=NO}
24		25
25	command="%%PREFIX%%/bin/salt-api"	26	command="%%PREFIX%%/bin/salt-api"
26	command_interpreter="%%PYTHON_CMD%%"	27	command_interpreter="%%PYTHON_CMD%%"

Lines 10-28 Link Here

(-)files/salt_minion.in (-5 / +10 lines)
10		10
11	# Add the following to /etc/rc.conf[.local] to enable this service	11	# Add the following to /etc/rc.conf[.local] to enable this service
12	#	12	#
13	# salt_minion_enable="YES"	13	# salt_minion_enable (bool): Set to NO by default.
		14	# Set it to YES to enable salt_minion
		15	# salt_minion_paths (string): Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
		16	# Default $PATH for salt_minion
		17	# salt_minion_eggcache (string): Set to "/tmp" by default.
		18	# Allows defining egg cache directory to fix runtime on diskless systems.
14	#	19	#
15		20
16	. /etc/rc.subr	21	. /etc/rc.subr
17		22
18	name="salt_minion"	23	name=salt_minion
19	rcvar=salt_minion_enable	24	rcvar=salt_minion_enable
20		25
21	load_rc_config ${name}	26	load_rc_config ${name}
22		27
23	: ${salt_minion_enable:="NO"}	28	: ${salt_minion_enable:=NO}
24	: ${salt_minion_paths="$PATH"}	29	: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
25	: ${salt_minion_eggcache="/tmp"}	30	: ${salt_minion_eggcache=/tmp}
26		31
27	command="%%PREFIX%%/bin/salt-minion"	32	command="%%PREFIX%%/bin/salt-minion"
28	command_interpreter="%%PYTHON_CMD%%"	33	command_interpreter="%%PYTHON_CMD%%"

Line 0 Link Here

(-)files/salt_proxy.in (+59 lines)
	1	#!/bin/sh
	2
	3	# $FreeBSD$
	4	#
	5	# Salt Proxy startup script
	6	#
	7	# PROVIDE: salt_proxy
	8	# REQUIRE: LOGIN
	9	# KEYWORD: shutdown
	10
	11	# Add the following to /etc/rc.conf[.local] to enable this service
	12	#
	13	# salt_proxy_enable (bool): Set to NO by default.
	14	# Set it to YES to enable salt_proxy.
	15	# salt_proxy_paths (string): Set to "/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin" by default.
	16	# Default $PATH for Salt
	17	# salt_proxy_eggcache (string): Set to "/tmp" by default.
	18	# Allows defining egg cache directory to fix runtime on diskless systems.
	19	# salt_proxy_list (string): Set to "" by default.
	20	# Space separated list of proxies.
	21	#
	22
	23	. /etc/rc.subr
	24
	25	name=salt_proxy
	26	rcvar=salt_proxy_enable
	27
	28	load_rc_config ${name}
	29
	30	: ${salt_proxy_enable:=NO}
	31	: ${salt_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
	32	: ${salt_proxy_eggcache=/tmp}
	33
	34	start_cmd=salt_proxy_start
	35
	36	command="%%PREFIX%%/bin/salt-proxy"
	37	command_interpreter="%%PYTHON_CMD%%"
	38	required_files="%%PREFIX%%/etc/salt"
	39	command_args="-c ${required_files} -d"
	40
	41	export PATH="${salt_minion_paths}"
	42	export PYTHON_EGG_CACHE="${salt_minion_eggcache}"
	43
	44	salt_proxy_start()
	45	{
	46	if [ -n "${salt_proxy_list}" ]; then
	47	echo "${salt_proxy_list} is undefined"
	48	return 1
	49	fi
	50
	51	local _proxy
	52
	53	for _proxy in ${salt_proxy_list}; do
	54	echo "Starting salt-proxy: ${_proxy}"
	55	${command_interpreter} ${command} --proxyid ${_proxy} ${command_args}
	56	done
	57	}
	58
	59	run_rc_command "$1"

Lines 10-26 Link Here

(-)files/salt_syndic.in (-3 / +4 lines)
10		10
11	# Add the following to /etc/rc.conf[.local] to enable this service	11	# Add the following to /etc/rc.conf[.local] to enable this service
12	#	12	#
13	# salt_syndic_enable="YES"	13	# salt_syndic_enable (bool): Set to NO by default.
		14	# Set it to YES to enable salt_syndic
14	#	15	#
15		16
16	. /etc/rc.subr	17	. /etc/rc.subr
17		18
18	name="salt_syndic"	19	name=salt_syndic
19	rcvar=salt_syndic_enable	20	rcvar=salt_syndic_enable
20		21
21	load_rc_config ${name}	22	load_rc_config ${name}
22		23
23	: ${salt_syndic_enable:="NO"}	24	: ${salt_syndic_enable:=NO}
24		25
25	command="%%PREFIX%%/bin/salt-syndic"	26	command="%%PREFIX%%/bin/salt-syndic"
26	command_interpreter="%%PYTHON_CMD%%"	27	command_interpreter="%%PYTHON_CMD%%"