Skip to content

Commit 2290d3e

Browse files
skerschbkay-kim
authored andcommitted
kmip certificate selector
1 parent cf731e7 commit 2290d3e

File tree

5 files changed

+55
-4
lines changed

5 files changed

+55
-4
lines changed

source/includes/options-conf.yaml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,30 @@ inherit:
650650
file: options-mongod.yaml
651651
---
652652
program: conf
653+
name: net.ssl.certificateSelector
654+
type: string
655+
directive: setting
656+
replacement:
657+
program: ":binary:`~bin.mongos` or :binary:`~bin.mongod`"
658+
directive: "setting"
659+
inherit:
660+
name: sslCertificateSelector
661+
program: mongod
662+
file: options-mongod.yaml
663+
---
664+
program: conf
665+
name: net.ssl.clusterCertificateSelector
666+
type: string
667+
directive: setting
668+
replacement:
669+
program: ":binary:`~bin.mongos` or :binary:`~bin.mongod`"
670+
directive: "setting"
671+
inherit:
672+
name: sslClusterCertificateSelector
673+
program: mongod
674+
file: options-mongod.yaml
675+
---
676+
program: conf
653677
name: net.ssl.PEMKeyFile
654678
type: string
655679
directive: setting
@@ -1747,6 +1771,25 @@ description: |
17471771
17481772
---
17491773
program: conf
1774+
name: security.kmip.clientCertificateSelector
1775+
directive: setting
1776+
type: string
1777+
description: |
1778+
1779+
.. versionadded:: 4.0
1780+
1781+
Specifies the selector and value to search when using Windows or
1782+
macOS system certificate store mechanisms for client certificates.
1783+
1784+
This option must be followed by a key value pair indicated by
1785+
<parameter>=<value>. In this case, <parameter> is the name of the
1786+
selector.
1787+
1788+
.. include:: /includes/option-ssl-certificateSelector.rst
1789+
1790+
.. include:: /includes/fact-enterprise-only-admonition.rst
1791+
---
1792+
program: conf
17501793
name: security.kmip.keyIdentifier
17511794
directive: setting
17521795
type: string

source/reference/configuration-options.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,8 @@ Key Management Configuration Options
477477

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

480+
.. include:: /includes/option/setting-conf-security.kmmip.clientCertificateSelector.rst
481+
480482
.. include:: /includes/option/setting-conf-security.kmip.serverCAFile.rst
481483

482484
``security.sasl`` Options

source/reference/program/mongod.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,8 @@ Encryption Key Management Options
344344

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

347+
.. include:: /includes/option/option-mongod-kmipClientCertificateSelector.rst
348+
347349
.. include:: /includes/option/option-mongod-kmipServerCAFile.rst
348350

349351
Text Search Options

source/tutorial/configure-ssl-clients.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,17 @@ settings, including:
5656
.. versionadded:: 4.0
5757

5858
- :option:`--sslCertificateSelector <mongo --sslCertificateSelector>` option if you
59-
wish to use the system store for clients running on Mac or Windows.
59+
wish to use the system store for clients running on macOS or Windows.
60+
61+
.. include:: /includes/extracts/mongo-ssl-options-configure.rst
62+
63+
.. include:: /includes/extracts/clients-warning-sslCAFile.rst
6064

6165
For a complete list of the :binary:`~bin.mongo` shell's TLS/SSL settings, see
6266
:ref:`mongo-shell-ssl`.
6367

64-
Using System Stores for Storing Keys and Certificates for Mac and Windows
65-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
68+
Using System Stores for Storing Keys and Certificates for macOS and Windows
69+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6670

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

source/tutorial/configure-ssl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Procedures
112112

113113
.. versionadded:: 4.0
114114

115-
Using System Stores for Storing Keys and Certificates for Mac and Windows
115+
Using System Stores for Storing Keys and Certificates for macOS and Windows
116116
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
117117

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

0 commit comments

Comments
 (0)