Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-09 16:03:26 +02:00
Code Issues Activity

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

Browse Source
This commit is contained in:
Kenneth Wilke committed 2013-08-27 11:14:18 -05:00
2 parents e3a29bf69a ca231053f2
commit d337cc2784
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
salt/files/minion
+1 -1
View File
@@ -17,7 +17,7 @@
# Per default the minion will automatically include all config files # Per default the minion will automatically include all config files
# from minion.d/*.conf (minion.d is a directory in the same directory # from minion.d/*.conf (minion.d is a directory in the same directory
# as the main minion config file). # 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 # Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start. # resolved, then the minion will fail to start.