valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add autoreject_file to master config file documentation

Browse Source 
Included a versionadded directive to note when this was added, to reduce
confusion.
This commit is contained in:
Erik Johnson 2013-11-21 17:12:31 -06:00
parent e9eae00028
commit e7e84ff305
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ mode set this value to ``True``.
Default: ``False``
Enable auto_accept. This setting will automatically accept all incoming
public keys from the minions
public keys from minions.
.. code-block:: yaml
@ -295,13 +295,25 @@ public keys from the minions
``autosign_file``
-----------------
Default ``not defined``
Default: ``not defined``
If the autosign_file is specified incoming keys specified in the autosign_file
will be automatically accepted. Matches will be searched for first by string
comparison, then by globbing, then by full-string regex matching. This is
If the ``autosign_file`` is specified incoming keys specified in the autosign_file
will be automatically accepted. Matches will be searched for first by string
comparison, then by globbing, then by full-string regex matching. This is
insecure!
``autoreject_file``
-------------------
.. versionadded:: Hydrogen
Default: ``not defined``
Works like :conf_master:`autosign_file`, but instead allows you to specify
minion IDs for which keys will automatically be rejected. Will override both
membership in the :conf_master:`autosign_file` and the
:conf_master:`auto_accept` setting.
.. conf_master:: client_acl
``client_acl``