From 54e61e011bc3aeb4e32413a886f547c198baa073 Mon Sep 17 00:00:00 2001 From: Seth House Date: Fri, 13 Feb 2015 17:17:12 -0700 Subject: [PATCH] Minor clarifications to the rest_cherrypy setup/usage instructions --- salt/netapi/rest_cherrypy/app.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py index 690ab581d3..a61fa2ab77 100644 --- a/salt/netapi/rest_cherrypy/app.py +++ b/salt/netapi/rest_cherrypy/app.py @@ -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