Merge pull request #17013 from whiteinge/doc-rest_cherrypy-key

Added missing docs for the /key rest_cherrypy entry point
2024-11-08 01:18:58 +00:00 · 2014-10-29 15:39:10 -06:00 · 2014-10-29 15:39:10 -06:00 · b6465332a0
commit b6465332a0
parent 060cae8edc 9da07584e4
2 changed files with 13 additions and 7 deletions
--- a/doc/ref/netapi/all/salt.netapi.rest_cherrypy.rst
+++ b/doc/ref/netapi/all/salt.netapi.rest_cherrypy.rst
@ -56,18 +56,24 @@ REST URI Reference
 .. autoclass:: Events
    :members: GET

-``/ws``
-------
-
-.. autoclass:: WebsocketEndpoint
-    :members: GET
-
 ``/hook``
 ---------

 .. autoclass:: Webhook
    :members: POST

+``/key``
+---------
+
+.. autoclass:: Keys
+    :members: GET, POST
+
+``/ws``
+-------
+
+.. autoclass:: WebsocketEndpoint
+    :members: GET
+
 ``/stats``
 ----------

--- a/salt/netapi/rest_cherrypy/app.py
+++ b/salt/netapi/rest_cherrypy/app.py
@ -1083,7 +1083,7 @@ class Keys(LowDataAdapter):
                    -d username=kickstart \
                    -d password=kickstart \
                    -d eauth=pam \
-                | tar xf -
+                    -o jerry-salt-keys.tar

        .. code-block:: http