saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24935 from basepi/merge-forward-2015.5

Browse source 
[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Justin Findlay 2015-06-24 12:17:54 -06:00
commit 925a4d91ba
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/smartos/salt-minion.xml
View file

@ -14,7 +14,7 @@
grouping="require_all"
restart_on="none"
type="path">
<service_fmri value='file:///opt/local/etc/salt/minion'/>
<service_fmri value="file:///opt/local/etc/salt/minion"/>
</dependency>
<dependency name="network"
@ -31,17 +31,17 @@
<service_fmri value="svc:/system/filesystem/local"/>
</dependency>
<method_context>
<method_environment>
<envvar name='PATH'
value='/usr/local/sbin:/usr/local/bin:/opt/local/sbin:/opt/local/bin:/usr/sbin:/usr/bin:/sbin'/>
</method_environment>
</method_context>
<exec_method type="method"
name="start"
exec="/opt/local/bin/salt-minion -c %{config_dir}"
timeout_seconds="60"/>
timeout_seconds="60">
<method_context>
<method_environment>
<envvar name="PATH"
value="/usr/local/sbin:/usr/local/bin:/opt/local/sbin:/opt/local/bin:/usr/sbin:/usr/bin:/sbin"/>
</method_environment>
</method_context>
</exec_method>
<exec_method type="method"
name="stop"