Attachment #161407 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




  o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
  o Update to meet your needs
  o sysrc salt_master_enable="YES"
  o sysrc salt_master_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"

---------------------------------------------------------------------------------------------------


  o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion
  o Update 'master: salt' to point to your Salt Master's hostname or IP
  o sysrc salt_minion_enable="YES"
  o sysrc salt_minion_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"

---------------------------------------------------------------------------------------------------

To configure a Salt Proxy Minion, do the following:

  o sysrc salt_proxy_enable="YES"
  o sysrc salt_proxy_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
  o sysrc salt_proxy_list=""
  o Update the salt_proxy_list with the proxy minion name(s)  

===================================================================================================






. /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 15-26 Link Here

(-)files/salt_master.in (-2 / +7 lines)
15		15
16	. /etc/rc.subr	16	. /etc/rc.subr
17		17
18	name="salt_master"	18	name=salt_master
19	rcvar=salt_master_enable	19	rcvar=salt_master_enable
20		20
21	load_rc_config ${name}	21	load_rc_config ${name}
22		22
23	: ${salt_master_enable:="NO"}	23	: ${salt_master_enable:=NO}
		24	: ${salt_master_paths=$PATH}
		25	: ${salt_master_eggcache=/tmp}
24		26
25	command="%%PREFIX%%/bin/salt-master"	27	command="%%PREFIX%%/bin/salt-master"
26	command_interpreter="%%PYTHON_CMD%%"	28	command_interpreter="%%PYTHON_CMD%%"
Lines 27-30 Link Here
27	required_files="%%PREFIX%%/etc/salt"	29	required_files="%%PREFIX%%/etc/salt"
28	command_args="-c ${required_files} -d"	30	command_args="-c ${required_files} -d"
29		31
		32	export PATH="${salt_master_paths}"
		33	export PYTHON_EGG_CACHE="${salt_master_eggcache}"
		34
30	run_rc_command "$1"	35	run_rc_command "$1"





. /etc/rc.subr

name=salt_minion
rcvar=salt_minion_enable

load_rc_config ${name}

: ${salt_minion_enable:=NO}
: ${salt_minion_paths=$PATH}
: ${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="YES"
#

. /etc/rc.subr

name=salt_proxy
rcvar=salt_proxy_enable

load_rc_config ${name}

: ${salt_proxy_enable:=NO}
: ${salt_minion_paths=$PATH}
: ${salt_minion_eggcache=/tmp}
: ${salt_proxy_list=}

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"





. /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 6-11 Link Here

(-)files/pkg-message.in (+11 lines)
6	o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master	6	o Copy %%PREFIX%%/etc/salt/master.sample to %%PREFIX%%/etc/salt/master
7	o Update to meet your needs	7	o Update to meet your needs
8	o sysrc salt_master_enable="YES"	8	o sysrc salt_master_enable="YES"
		9	o sysrc salt_master_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
9		10
10	---------------------------------------------------------------------------------------------------	11	---------------------------------------------------------------------------------------------------
11		12
Lines 14-19 Link Here
14	o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion	15	o Copy %%PREFIX%%/etc/salt/minion.sample to %%PREFIX%%/etc/salt/minion
15	o Update 'master: salt' to point to your Salt Master's hostname or IP	16	o Update 'master: salt' to point to your Salt Master's hostname or IP
16	o sysrc salt_minion_enable="YES"	17	o sysrc salt_minion_enable="YES"
		18	o sysrc salt_minion_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
17		19
		20	---------------------------------------------------------------------------------------------------
		21
		22	To configure a Salt Proxy Minion, do the following:
		23
		24	o sysrc salt_proxy_enable="YES"
		25	o sysrc salt_proxy_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
		26	o sysrc salt_proxy_list=""
		27	o Update the salt_proxy_list with the proxy minion name(s)
		28
18	===================================================================================================	29	===================================================================================================
19		30

Lines 15-26 Link Here

(-)files/salt_api.in (-2 / +2 lines)
15		15
16	. /etc/rc.subr	16	. /etc/rc.subr
17		17
18	name="salt_api"	18	name=salt_api
19	rcvar=salt_api_enable	19	rcvar=salt_api_enable
20		20
21	load_rc_config ${name}	21	load_rc_config ${name}
22		22
23	: ${salt_api_enable:="NO"}	23	: ${salt_api_enable:=NO}
24		24
25	command="%%PREFIX%%/bin/salt-api"	25	command="%%PREFIX%%/bin/salt-api"
26	command_interpreter="%%PYTHON_CMD%%"	26	command_interpreter="%%PYTHON_CMD%%"

Lines 15-28 Link Here

(-)files/salt_minion.in (-4 / +4 lines)
15		15
16	. /etc/rc.subr	16	. /etc/rc.subr
17		17
18	name="salt_minion"	18	name=salt_minion
19	rcvar=salt_minion_enable	19	rcvar=salt_minion_enable
20		20
21	load_rc_config ${name}	21	load_rc_config ${name}
22		22
23	: ${salt_minion_enable:="NO"}	23	: ${salt_minion_enable:=NO}
24	: ${salt_minion_paths="$PATH"}	24	: ${salt_minion_paths=$PATH}
25	: ${salt_minion_eggcache="/tmp"}	25	: ${salt_minion_eggcache=/tmp}
26		26
27	command="%%PREFIX%%/bin/salt-minion"	27	command="%%PREFIX%%/bin/salt-minion"
28	command_interpreter="%%PYTHON_CMD%%"	28	command_interpreter="%%PYTHON_CMD%%"

Line 0 Link Here

(-)files/salt_proxy.in (+53 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="YES"
	14	#
	15
	16	. /etc/rc.subr
	17
	18	name=salt_proxy
	19	rcvar=salt_proxy_enable
	20
	21	load_rc_config ${name}
	22
	23	: ${salt_proxy_enable:=NO}
	24	: ${salt_minion_paths=$PATH}
	25	: ${salt_minion_eggcache=/tmp}
	26	: ${salt_proxy_list=}
	27
	28	start_cmd=salt_proxy_start
	29
	30	command="%%PREFIX%%/bin/salt-proxy"
	31	command_interpreter="%%PYTHON_CMD%%"
	32	required_files="%%PREFIX%%/etc/salt"
	33	command_args="-c ${required_files} -d"
	34
	35	export PATH="${salt_minion_paths}"
	36	export PYTHON_EGG_CACHE="${salt_minion_eggcache}"
	37
	38	salt_proxy_start()
	39	{
	40	if [ -n "${salt_proxy_list}" ]; then
	41	echo "${salt_proxy_list} is undefined"
	42	return 1
	43	fi
	44
	45	local _proxy
	46
	47	for _proxy in ${salt_proxy_list}; do
	48	echo "Starting salt-proxy: ${_proxy}"
	49	${command_interpreter} ${command} --proxyid ${_proxy} ${command_args}
	50	done
	51	}
	52
	53	run_rc_command "$1"

Lines 15-26 Link Here

(-)files/salt_syndic.in (-2 / +2 lines)
15		15
16	. /etc/rc.subr	16	. /etc/rc.subr
17		17
18	name="salt_syndic"	18	name=salt_syndic
19	rcvar=salt_syndic_enable	19	rcvar=salt_syndic_enable
20		20
21	load_rc_config ${name}	21	load_rc_config ${name}
22		22
23	: ${salt_syndic_enable:="NO"}	23	: ${salt_syndic_enable:=NO}
24		24
25	command="%%PREFIX%%/bin/salt-syndic"	25	command="%%PREFIX%%/bin/salt-syndic"
26	command_interpreter="%%PYTHON_CMD%%"	26	command_interpreter="%%PYTHON_CMD%%"