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

Merge pull request #32874 from basepi/issue_16196

Browse Source 
Add ssh_use_home_key to master config docs/template
This commit is contained in:
Nicole Thomas 2016-04-26 14:20:58 -06:00
commit a4e4ff257b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/master
View File

@ -350,6 +350,10 @@
#ssh_minion_opts:
# gpg_keydir: /root/gpg
# Set this to True to default to using ~/.ssh/id_rsa for salt-ssh
# authentication with minions
#ssh_use_home_key: False
##### Master Module Management #####
##########################################
# Manage how master side modules are loaded.

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

@ -620,9 +620,20 @@ overridden on a per-minion basis in the roster (``minion_opts``)
.. code-block:: yaml
minion_opts:
ssh_minion_opts:
gpg_keydir: /root/gpg
``ssh_use_home_key``
--------------------
Default: False
Set this to True to default to using ``~/.ssh/id_rsa`` for salt-ssh
authentication with minions
.. code-block:: yaml
ssh_use_home_key: False
Master Security Settings
========================