mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
Minor clarifications to the rest_cherrypy setup/usage instructions
This commit is contained in:
parent
561ea7cdf3
commit
54e61e011b
@ -28,12 +28,13 @@ A REST API for Salt
|
||||
authentication credentials will be sent over the wire.
|
||||
|
||||
A self-signed certificate can be generated using the
|
||||
:py:func:`~salt.modules.tls.create_self_signed_cert` function in Salt (note
|
||||
the dependencies for this module).
|
||||
:py:func:`~salt.modules.tls.create_self_signed_cert` execution function.
|
||||
Running this function requires pyOpenSSL and the ``salt-call`` script is
|
||||
available in the ``salt-minion`` package.
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt-call tls.create_self_signed_cert
|
||||
salt-call --local tls.create_self_signed_cert
|
||||
|
||||
All available configuration options are detailed below. These settings
|
||||
configure the CherryPy HTTP server and do not apply when using an external
|
||||
@ -146,7 +147,6 @@ The token may be sent in one of two ways:
|
||||
curl -sSk https://localhost:8000 \
|
||||
-b ~/cookies.txt \
|
||||
-H 'Accept: application/x-yaml' \
|
||||
-H 'X-Auth-Token: 697adbdc8fe971d09ae4c2a3add7248859c87079'\
|
||||
-d client=local \
|
||||
-d tgt='*' \
|
||||
-d fun=test.ping
|
||||
|
Loading…
Reference in New Issue
Block a user