saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix up docs

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-12-18 21:51:35 -07:00 • committed by Daniel Wozniak
parent eee8396473
commit a31597fea7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/topics/transports/ssl.rst
View file

@ -18,9 +18,9 @@ function for backwards compatability.
The ``ssl`` option accepts ``verify_locations`` and ``verify_flags``. The
``verify_locations`` option is a list of strings or dictionaries. Strings are
passed as a single argument to the SSL context's ``load_verify_locations``
method. Dictionaries keys are expected to be one of ``cafile``, ``capath``,
method. Dictionary keys are expected to be one of ``cafile``, ``capath``,
``cadata``. For each corresponding key, the key and value will be passed as a
keyword argument to ``load_verify_locations``. The ``verify_flags`` options is
keyword argument to ``load_verify_locations``. The ``verify_flags`` option is
a list of string names of verification flags which will be set on the SSL
context. All paths are assumed to be the full path to the file or directory.
@ -33,7 +33,7 @@ master configuration file:
keyfile: <path_to_keyfile>
certfile: <path_to_certfile>
A more complex setup looks like this, on the Salt Master add the ``ssl``
A more complex setup looks like this, on the Salt Master add the ``ssl``
option to the master's configuration file. In this example the Salt Master will
require valid client side certificates from Minions by setting ``cert_reqs`` to
``CERT_REQUIRED``. The Salt Master will also check a certificate revocation list
@ -61,7 +61,7 @@ The minimal `ssl` option in the minion configuration file looks like this:
# Versions below 2016.11.4:
ssl: {}
A Minion can be configured to present a client certificat to the master like this:
A Minion can be configured to present a client certificate to the master like this:
.. code-block:: yaml

2
doc/topics/transports/ws.rst
View file

@ -9,7 +9,7 @@ to ``ws`` on each Salt minion and Salt master.
TLS Support
===========
The Websocket transport support full encryption and verification using both server
The Websocket transport supports full encryption and verification using both server
and client certificates. See :doc:`ssl` for more details.
Publish Server and Client