Skip to content

Commit 0121e3e

Browse files
Isabella Siukay-kim
authored andcommitted
DOCS-12022 backport sslClusterCAFile option to 3.4.18
1 parent a5b6924 commit 0121e3e

File tree

6 files changed

+61
-1
lines changed

6 files changed

+61
-1
lines changed

source/includes/options-conf.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,6 @@ description: |
539539
540540
Enables or disables IPv6 support. :binary:`~bin.mongos` or
541541
:binary:`~bin.mongod` disables IPv6 support by default.
542-
543542
---
544543
program: conf
545544
name: net.http.JSONPEnabled
@@ -662,6 +661,19 @@ inherit:
662661
file: options-mongod.yaml
663662
---
664663
program: conf
664+
name: net.ssl.clusterCAFile
665+
type: string
666+
directive: setting
667+
replacement:
668+
program: ":binary:`~bin.mongos` or :binary:`~bin.mongod`"
669+
intro: "The"
670+
cafile: ":setting:`net.ssl.CAFile`"
671+
inherit:
672+
name: sslClusterCAFile
673+
program: mongod
674+
file: options-mongod.yaml
675+
---
676+
program: conf
665677
name: net.ssl.CRLFile
666678
type: string
667679
directive: setting

source/includes/options-mongod.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,6 +1373,35 @@ replacement:
13731373
intro: "Specifies the"
13741374
---
13751375
program: mongod
1376+
name: sslClusterCAFile
1377+
args: <filename>
1378+
directive: option
1379+
description: |
1380+
1381+
.. versionadded:: 3.4.18
1382+
1383+
{{intro}} :file:`.pem` file that contains the root certificate chain
1384+
from the Certificate Authority used to validate the certificate
1385+
presented by a client establishing a connection. Specify the file
1386+
name of the :file:`.pem` file using relative or absolute paths.
1387+
1388+
If {{role}} does not specify the :file:`.pem` file for validating the
1389+
certificate from a client establishing a connection, the cluster uses
1390+
the :file:`.pem` file specified in the {{cafile}} option.
1391+
1392+
{{role}} lets you use separate Certificate Authorities to verify the
1393+
client to server and server to client portions of the TLS handshake.
1394+
1395+
Requires that {{cafile}} is set.
1396+
1397+
.. include:: /includes/extracts/ssl-facts-see-more.rst
1398+
1399+
optional: true
1400+
replacement:
1401+
intro: "Specifies the"
1402+
cafile: ":option:`--sslCAFile`"
1403+
---
1404+
program: mongod
13761405
name: sslCRLFile
13771406
args: <filename>
13781407
directive: option

source/includes/options-mongos.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,13 @@ inherit:
321321
file: options-mongod.yaml
322322
---
323323
program: mongos
324+
name: sslClusterCAFile
325+
inherit:
326+
name: sslClusterCAFile
327+
program: mongod
328+
file: options-mongod.yaml
329+
---
330+
program: mongos
324331
name: sslCRLFile
325332
inherit:
326333
name: sslCRLFile

source/reference/configuration-options.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ Core Options
238238
clusterFile: <string>
239239
clusterPassword: <string>
240240
CAFile: <string>
241+
clusterCAFile: <string>
241242
CRLFile: <string>
242243
allowConnectionsWithoutCertificates: <boolean>
243244
allowInvalidCertificates: <boolean>
@@ -297,6 +298,9 @@ Core Options
297298

298299
.. include:: /includes/option/setting-conf-net.http.RESTInterfaceEnabled.rst
299300

301+
302+
.. _net-ssl-conf-options:
303+
300304
``net.ssl`` Options
301305
```````````````````
302306

@@ -311,6 +315,7 @@ Core Options
311315
clusterFile: <string>
312316
clusterPassword: <string>
313317
CAFile: <string>
318+
clusterCAFile: <string>
314319
CRLFile: <string>
315320
allowConnectionsWithoutCertificates: <boolean>
316321
allowInvalidCertificates: <boolean>
@@ -332,6 +337,8 @@ Core Options
332337

333338
.. include:: /includes/option/setting-conf-net.ssl.CAFile.rst
334339

340+
.. include:: /includes/option/setting-conf-net.ssl.clusterCAFile.rst
341+
335342
.. include:: /includes/option/setting-conf-net.ssl.CRLFile.rst
336343

337344
.. include:: /includes/option/setting-conf-net.ssl.allowConnectionsWithoutCertificates.rst

source/reference/program/mongod.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ Sharded Cluster Options
255255

256256
.. include:: /includes/option/option-mongod-noMoveParanoia.rst
257257

258+
258259
TLS/SSL Options
259260
~~~~~~~~~~~~~~~
260261

@@ -279,6 +280,8 @@ TLS/SSL Options
279280

280281
.. include:: /includes/option/option-mongod-sslCAFile.rst
281282

283+
.. include:: /includes/option/option-mongod-sslClusterCAFile.rst
284+
282285
.. include:: /includes/option/option-mongod-sslCRLFile.rst
283286

284287
.. include:: /includes/option/option-mongod-sslAllowInvalidCertificates.rst

source/reference/program/mongos.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ TLS/SSL Options
119119

120120
.. include:: /includes/option/option-mongos-sslCAFile.rst
121121

122+
.. include:: /includes/option/option-mongos-sslClusterCAFile.rst
123+
122124
.. include:: /includes/option/option-mongos-sslCRLFile.rst
123125

124126
.. include:: /includes/option/option-mongos-sslAllowConnectionsWithoutCertificates.rst

0 commit comments

Comments
 (0)