Skip to content

fix conf and options #3375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2018
Merged

fix conf and options #3375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions source/includes/options-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,20 +1774,10 @@ program: conf
name: security.kmip.clientCertificateSelector
directive: setting
type: string
description: |

.. versionadded:: 4.0

Specifies the selector and value to search when using Windows or
macOS system certificate store mechanisms for client certificates.

This option must be followed by a key value pair indicated by
<parameter>=<value>. In this case, <parameter> is the name of the
selector.

.. include:: /includes/option-ssl-certificateSelector.rst

.. include:: /includes/fact-enterprise-only-admonition.rst
inherit:
name: kmipClientCertificateSelector
program: mongod
file: options-mongod.yaml
---
program: conf
name: security.kmip.keyIdentifier
Expand Down
20 changes: 20 additions & 0 deletions source/includes/options-mongod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2875,5 +2875,25 @@ post: |

For the corresponding configuration file setting, see
:setting:`cloud.monitoring.free.tag`.
---
program: mongod
name: kmipClientCertificateSelector
args: <string>
directive: option
optional: true
description: |

.. versionadded:: 4.0

Specifies the selector and value to search when using Windows or
macOS system certificate store mechanisms for client certificates.

This option must be followed by a key value pair indicated by
<parameter>=<value>. In this case, <parameter> is the name of the
selector.

.. include:: /includes/option-ssl-certificateSelector.rst

.. include:: /includes/fact-enterprise-only-admonition.rst

...
4 changes: 3 additions & 1 deletion source/reference/configuration-options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ Core Options
port: <string>
clientCertificateFile: <string>
clientCertificatePassword: <string>
clientCertificateSelector: <string>
serverCAFile: <string>
ldap:
servers: <string>
Expand Down Expand Up @@ -457,6 +458,7 @@ Key Management Configuration Options
port: <string>
clientCertificateFile: <string>
clientCertificatePassword: <string>
clientCertificateSelector: <string>
serverCAFile: <string>

.. include:: /includes/option/setting-conf-security.enableEncryption.rst
Expand All @@ -477,7 +479,7 @@ Key Management Configuration Options

.. include:: /includes/option/setting-conf-security.kmip.clientCertificatePassword.rst

.. include:: /includes/option/setting-conf-security.kmmip.clientCertificateSelector.rst
.. include:: /includes/option/setting-conf-security.kmip.clientCertificateSelector.rst

.. include:: /includes/option/setting-conf-security.kmip.serverCAFile.rst

Expand Down
4 changes: 1 addition & 3 deletions source/reference/program/mongod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,10 @@ Encryption Key Management Options

.. include:: /includes/option/option-mongod-kmipPort.rst

.. include:: /includes/option/option-mongod-kmipClientCertificateFile.rst
.. include:: /includes/option/option-mongod-kmipClientCertificateSelector.rst

.. include:: /includes/option/option-mongod-kmipClientCertificatePassword.rst

.. include:: /includes/option/option-mongod-kmipClientCertificateSelector.rst

.. include:: /includes/option/option-mongod-kmipServerCAFile.rst

Text Search Options
Expand Down
3 changes: 1 addition & 2 deletions source/tutorial/configure-ssl-clients.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ settings, including:
- :option:`--sslCertificateSelector <mongo --sslCertificateSelector>` option if you
wish to use the system store for clients running on macOS or Windows.

.. include:: /includes/extracts/mongo-ssl-options-configure.rst
.. include:: /includes/extracts/ssl-facts-mongo-ssl-options-configure.rst

.. include:: /includes/extracts/clients-warning-sslCAFile.rst

For a complete list of the :binary:`~bin.mongo` shell's TLS/SSL settings, see
:ref:`mongo-shell-ssl`.
Expand Down
2 changes: 1 addition & 1 deletion source/tutorial/configure-ssl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Procedures
.. versionadded:: 4.0

Using System Stores for Storing Keys and Certificates for macOS and Windows
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. include:: /includes/ssl-trusted-store.rst

Expand Down