Attachment 161275 Details for Bug 203262 – patch

patch

py-salt-2015.8.0_1.diff.txt (text/plain), 3.59 KB, created by Christer Edwards on 2015-09-22 15:13:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2015-09-22 15:13:47 UTC

Size: 3.59 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2015.8.0_1/Makefile
>--- py-salt/Makefile	2015-09-12 18:02:21.000000000 -0600
>+++ py-salt-2015.8.0_1/Makefile	2015-09-22 08:33:55.035648721 -0600
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	salt
> PORTVERSION=	2015.8.0
>+PORTREVISION=	1
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -58,7 +59,9 @@
> 
> USE_RC_SUBR=	salt_master \
> 		salt_minion \
>-		salt_syndic
>+		salt_syndic \
>+		salt_proxy \
>+		salt_api
> 
> SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
> 
>diff -ruN py-salt/files/pkg-message.in py-salt-2015.8.0_1/files/pkg-message.in
>--- py-salt/files/pkg-message.in	2015-05-23 21:25:44.000000000 -0600
>+++ py-salt-2015.8.0_1/files/pkg-message.in	2015-09-22 08:53:46.731688937 -0600
>@@ -6,6 +6,7 @@
>   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"
> 
> ---------------------------------------------------------------------------------------------------
> 
>@@ -14,6 +15,15 @@
>   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_list=""
>+  o Update the salt_proxy_list with the proxy minion name(s)  
> 
> ===================================================================================================
> 
>diff -ruN py-salt/files/salt_master.in py-salt-2015.8.0_1/files/salt_master.in
>--- py-salt/files/salt_master.in	2012-11-03 05:46:30.000000000 -0600
>+++ py-salt-2015.8.0_1/files/salt_master.in	2015-09-22 08:57:27.432551442 -0600
>@@ -21,10 +21,15 @@
> load_rc_config ${name}
> 
> : ${salt_master_enable:="NO"}
>+: ${salt_master_paths="$PATH"}
>+: ${salt_master_eggcache="/tmp"}
> 
> command="%%PREFIX%%/bin/salt-master"
> command_interpreter="%%PYTHON_CMD%%"
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
> 
>+export PATH="${salt_master_paths}"
>+export PYTHON_EGG_CACHE="${salt_master_eggcache}"
>+
> run_rc_command "$1"
>diff -ruN py-salt/files/salt_proxy.in py-salt-2015.8.0_1/files/salt_proxy.in
>--- py-salt/files/salt_proxy.in	1969-12-31 17:00:00.000000000 -0700
>+++ py-salt-2015.8.0_1/files/salt_proxy.in	2015-09-22 08:36:33.262636421 -0600
>@@ -0,0 +1,50 @@
>+#!/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="/usr/local/bin/salt-proxy"
>+command_interpreter="/usr/local/bin/python2.7"
>+required_files="/usr/local/etc/salt"
>+command_args="-c ${required_files} -d"
>+
>+export PATH="${salt_minion_paths}"
>+export PYTHON_EGG_CACHE="${salt_minion_eggcache}"
>+
>+salt_proxy_start()
>+{
>+    [ -n "salt_proxy_list" ] || return
>+
>+    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"

Actions: View

Attachments on bug 203262: 161275 | 161276 | 161407 | 161452