Attachment #235220 for bug #265173

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

Lines 2-7 Link Here

(-)py-salt/Makefile (+1 lines)
2		2
3	PORTNAME= salt	3	PORTNAME= salt
4	PORTVERSION= 3004.2	4	PORTVERSION= 3004.2
		5	PORTREVISION= 1
5	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
6	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}





: ${salt_master_enable:=NO}
: ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
: ${salt_master_configdir:=%%PREFIX%%/etc/salt}
: ${salt_master_pidfile:=/var/run/salt-master.pid}
: ${salt_master_eggcache=/tmp}

command="%%PREFIX%%/bin/salt-master"
command_interpreter="%%PYTHON_CMD%%"
required_files=${salt_master_configdir}
command_args="-c ${required_files} -d"
pidfile=${salt_master_pidfile}
command_args="-c ${required_files} --pid-file=${pidfile} -d"

export PATH="${salt_master_paths}"
export PYTHON_EGG_CACHE="${salt_master_eggcache}"





: ${salt_minion_enable:=NO}
: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
: ${salt_minion_configdir:=%%PREFIX%%/etc/salt}
: ${salt_minion_pidfile:=/var/run/salt-minion.pid}
: ${salt_minion_eggcache=/tmp}

command="%%PREFIX%%/bin/salt-minion"
command_interpreter="%%PYTHON_CMD%%"
required_files=${salt_minion_configdir}
command_args="-c ${required_files} -d"
pidfile=${salt_minion_pidfile}
command_args="-c ${required_files} --pid-file=${pidfile} -d"

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

Return to bug 265173

Lines 25-38 Link Here

(-)py-salt/files/salt_master.in (-2 / +3 lines)
25		25
26	: ${salt_master_enable:=NO}	26	: ${salt_master_enable:=NO}
27	: ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}	27	: ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
		28	: ${salt_master_configdir:=%%PREFIX%%/etc/salt}
28	: ${salt_master_pidfile:=/var/run/salt-master.pid}	29	: ${salt_master_pidfile:=/var/run/salt-master.pid}
29	: ${salt_master_eggcache=/tmp}	30	: ${salt_master_eggcache=/tmp}
30		31
31	command="%%PREFIX%%/bin/salt-master"	32	command="%%PREFIX%%/bin/salt-master"
32	command_interpreter="%%PYTHON_CMD%%"	33	command_interpreter="%%PYTHON_CMD%%"
33	required_files="%%PREFIX%%/etc/salt"	34	required_files=${salt_master_configdir}
34	command_args="-c ${required_files} -d"
35	pidfile=${salt_master_pidfile}	35	pidfile=${salt_master_pidfile}
		36	command_args="-c ${required_files} --pid-file=${pidfile} -d"
36		37
37	export PATH="${salt_master_paths}"	38	export PATH="${salt_master_paths}"
38	export PYTHON_EGG_CACHE="${salt_master_eggcache}"	39	export PYTHON_EGG_CACHE="${salt_master_eggcache}"

Lines 25-38 Link Here

(-)py-salt/files/salt_minion.in (-2 / +3 lines)
25		25
26	: ${salt_minion_enable:=NO}	26	: ${salt_minion_enable:=NO}
27	: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}	27	: ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
		28	: ${salt_minion_configdir:=%%PREFIX%%/etc/salt}
28	: ${salt_minion_pidfile:=/var/run/salt-minion.pid}	29	: ${salt_minion_pidfile:=/var/run/salt-minion.pid}
29	: ${salt_minion_eggcache=/tmp}	30	: ${salt_minion_eggcache=/tmp}
30		31
31	command="%%PREFIX%%/bin/salt-minion"	32	command="%%PREFIX%%/bin/salt-minion"
32	command_interpreter="%%PYTHON_CMD%%"	33	command_interpreter="%%PYTHON_CMD%%"
33	required_files="%%PREFIX%%/etc/salt"	34	required_files=${salt_minion_configdir}
34	command_args="-c ${required_files} -d"
35	pidfile=${salt_minion_pidfile}	35	pidfile=${salt_minion_pidfile}
		36	command_args="-c ${required_files} --pid-file=${pidfile} -d"
36		37
37	export PATH="${salt_minion_paths}"	38	export PATH="${salt_minion_paths}"
38	export PYTHON_EGG_CACHE="${salt_minion_eggcache}"	39	export PYTHON_EGG_CACHE="${salt_minion_eggcache}"