valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1872 from mrud/mru/include_doc

Browse Source 
Update documentation re. config file handling & autosigning
This commit is contained in:
Thomas S Hatch 2012-08-24 09:12:51 -07:00
commit c0b53306cf
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
doc/ref/configuration/master.rst
View File

@ -194,6 +194,17 @@ public keys from the minions
auto_accept: False
.. conf_master:: autosign_file
``autosign_file``
-----------------
Default ``not defined``
If the autosign_file is specified incoming keys specified in
the autosign_file will be automatically accepted. Regular expressions as
well as globbing can be used. This is insecure!
.. conf_master:: client_acl
``client_acl``
@ -585,3 +596,13 @@ still wish to have 'salt.modules' at the 'debug' level:
log_granular_levels:
'salt': 'warning',
'salt.modules': 'debug'
``default_include``
-------------------
Default: ``master.d/*.conf``
The minion can include configuration from other files. Per default the
minion will automatically include all config files from `master.d/*.conf`
where minion.d is relative to the directory of the minion configuration
file.

10
doc/ref/configuration/minion.rst
View File

@ -407,6 +407,16 @@ still wish to have 'salt.modules' at the 'debug' level:
.. conf_minion:: include
``default_include``
-------------------
Default: ``minion.d/*.conf``
The minion can include configuration from other files. Per default the
minion will automatically include all config files from `minion.d/*.conf`
where minion.d is relative to the directory of the minion configuration
file.
``include``
-----------