Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula

This commit is contained in:
Kenneth Wilke 2013-08-27 11:14:18 -05:00
parent e3a29bf69a ca231053f2
commit d337cc2784
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/minion
View File

@ -17,7 +17,7 @@
# Per default the minion will automatically include all config files
# from minion.d/*.conf (minion.d is a directory in the same directory
# as the main minion config file).
{{ get_config('default_include', 'master.d/*.conf') }}
{{ get_config('default_include', 'minion.d/*.conf') }}
# Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start.