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

Merge pull request #33488 from rallytime/fix-18752

Browse Source 
Add docs for the syndic_finger config
This commit is contained in:
Mike Place 2016-05-25 08:23:10 -07:00
commit dc644b145d
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/minion
View File

@ -311,6 +311,10 @@
#include:
# - /etc/salt/extra_config
# - /etc/roles/webserver
# The syndic minion can verify that it is talking to the correct master via the
# key fingerprint of the higher-level master with the "syndic_finger" config.
#syndic_finger: ''
#
#
#

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

@ -694,6 +694,19 @@ Pull port used when :conf_minion:`ipc_mode` is set to ``tcp``.
tcp_pull_port: 4511
.. conf_minion:: syndic_finger
``syndic_finger``
-----------------
Default: ``''``
The key fingerprint of the higher-level master for the syndic to verify it is
talking to the intended master.
.. code-block:: yaml
syndic_finger: 'ab:30:65:2a:d6:9e:20:4f:d8:b2:f3:a7:d4:65:50:10'
Minion Module Management