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 2

Mark keyword version adds

Browse source
This commit is contained in:
Joe Julian 2015-06-09 12:43:46 -07:00
parent 76e2583265
commit 9cb7015568
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/ref/states/all/salt.states.tls.rst
View file

@ -3,8 +3,4 @@ salt.states.tls
===============
.. automodule:: salt.states.tls
<<<<<<< HEAD
:members:
=======
:members:
>>>>>>> develop

24
salt/modules/tls.py
View file

@ -316,6 +316,9 @@ def maybe_fix_ssl_version(ca_name, cacert_path=None, ca_filename=None):
ca_filename
alternative filename for the CA
.. versionadded:: 2015.5.3
CLI Example:
.. code-block:: bash
@ -380,6 +383,9 @@ def ca_exists(ca_name, cacert_path=None, ca_filename=None):
ca_filename
alternative filename for the CA
.. versionadded:: 2015.5.3
CLI Example:
.. code-block:: bash
@ -456,6 +462,9 @@ def get_ca_signed_cert(ca_name,
cert_filename
alternative filename for the certificate, useful when using special characters in the CN
.. versionadded:: 2015.5.3
CLI Example:
.. code-block:: bash
@ -497,6 +506,9 @@ def get_ca_signed_key(ca_name,
absolute path to certificates root directory
key_filename
alternative filename for the key, useful when using special characters
.. versionadded:: 2015.5.3
in the CN
CLI Example:
@ -591,6 +603,9 @@ def create_ca(ca_name,
absolute path to ca certificates root directory
ca_filename
alternative filename for the CA
.. versionadded:: 2015.5.3
digest
The message digest algorithm. Must be a string describing a digest
algorithm supported by OpenSSL (by EVP_get_digestbyname, specifically).
@ -1191,6 +1206,9 @@ def create_ca_signed_cert(ca_name,
ca_filename
alternative filename for the CA
.. versionadded:: 2015.5.3
cert_path
full path to the certificates directory
@ -1200,6 +1218,9 @@ def create_ca_signed_cert(ca_name,
the certificate filename output effects of ``cert_type``.
``type_ext`` will be completely overridden.
.. versionadded:: 2015.5.3
digest
The message digest algorithm. Must be a string describing a digest
algorithm supported by OpenSSL (by EVP_get_digestbyname, specifically).
@ -1553,6 +1574,9 @@ def create_empty_crl(
absolute path to ca certificates root directory
ca_filename
alternative filename for the CA
.. versionadded:: 2015.5.3
crl_file
full path to the CRL file