valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update master config docs

Browse Source
This commit is contained in:
Nicole Thomas 2016-04-07 09:10:19 -06:00 committed by Mike Place
parent 2cc054bbc0
commit c53efc3349
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/ref/configuration/master.rst
View File

@ -1190,10 +1190,10 @@ compatible version installed will be the provider that is used.
``gitfs_ssl_verify``
********************
Default: ``True``
Default: ``False``
Specifies whether or not to ignore SSL certificate errors when contacting the
remote repository. You might want to set this to ``False`` if you're using a
remote repository. The ``False`` setting is useful if you're using a
git repo that uses a self-signed certificate. However, keep in mind that
setting this to anything other ``True`` is a considered insecure, and using an
SSH-based transport (if available) may be a better option.
@ -2134,10 +2134,10 @@ files would be looked for in a subdirectory called ``pillar``.
.. versionadded:: 2015.8.0
Default: ``True``
Default: ``False``
Specifies whether or not to ignore SSL certificate errors when contacting the
remote repository. You might want to set this to ``False`` if you're using a
remote repository. The ``False`` setting is useful if you're using a
git repo that uses a self-signed certificate. However, keep in mind that
setting this to anything other ``True`` is a considered insecure, and using an
SSH-based transport (if available) may be a better option.
@ -2360,7 +2360,7 @@ strategy between different sources. It accepts 4 values:
Guesses the best strategy based on the "renderer" setting.
``pillar_merge_lists``
----------------------------------
----------------------
.. versionadded:: 2015.8.0
@ -2949,10 +2949,10 @@ branch/tag.
.. versionadded:: 2015.8.0
Default: ``True``
Default: ``False``
Specifies whether or not to ignore SSL certificate errors when contacting the
remote repository. You might want to set this to ``False`` if you're using a
remote repository. The ``False`` setting is useful if you're using a
git repo that uses a self-signed certificate. However, keep in mind that
setting this to anything other ``True`` is a considered insecure, and using an
SSH-based transport (if available) may be a better option.