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

Fix ssh exec module docstrings

Browse Source 
You don't need to end a line in a backslash within a docstring. Besides,
doing so leaves large gaps in the line when rendered by sphinx.
This commit is contained in:
Erik Johnson 2014-08-20 21:33:08 -05:00
parent 0d3ee9101c
commit 08704d47e1
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/modules/ssh.py
View File

@ -448,8 +448,7 @@ def set_auth_key_from_file(user,
.. code-block:: bash
salt '*' ssh.set_auth_key_from_file <user>\
salt://ssh_keys/<user>.id_rsa.pub
salt '*' ssh.set_auth_key_from_file <user> salt://ssh_keys/<user>.id_rsa.pub
'''
if env is not None:
salt.utils.warn_until(
@ -754,8 +753,7 @@ def set_known_host(user=None,
.. code-block:: bash
salt '*' ssh.set_known_host <user> fingerprint='xx:xx:..:xx' \
enc='ssh-rsa' config='.ssh/known_hosts'
salt '*' ssh.set_known_host <user> fingerprint='xx:xx:..:xx' enc='ssh-rsa' config='.ssh/known_hosts'
'''
if not hostname:
return {'status': 'error',
@ -852,16 +850,9 @@ def user_keys(user=None, pubfile=None, prvfile=None):
.. code-block:: bash
salt '*' ssh.user_keys
salt '*' ssh.user_keys user=user1
salt '*' ssh.user_keys user=user1 \
pubfile=/home/user1/.ssh/id_rsa.pub
prvfile=/home/user1/.ssh/id_rsa
salt '*' ssh.user_keys user="['user1','user2'] \
pubfile=id_rsa.pub prvfile=id_rsa
salt '*' ssh.user_keys user=user1 pubfile=/home/user1/.ssh/id_rsa.pub prvfile=/home/user1/.ssh/id_rsa
salt '*' ssh.user_keys user="['user1','user2'] pubfile=id_rsa.pub prvfile=id_rsa
'''
if not user:
user = __salt__['user.list_users']()