From cd187068d4d3fd48015943f0a98d562447969039 Mon Sep 17 00:00:00 2001 From: Michael Paik Date: Fri, 22 Aug 2014 17:09:59 -0400 Subject: [PATCH] DOCS-3701 fixes for ref pages --- source/includes/options-mongo.yaml | 2 ++ source/includes/options-mongod.yaml | 2 ++ source/includes/options-shared.yaml | 2 ++ source/includes/warning-x509-requires-sslCAfile.rst | 11 ++++++----- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/source/includes/options-mongo.yaml b/source/includes/options-mongo.yaml index 15b66de9637..002660554e5 100644 --- a/source/includes/options-mongo.yaml +++ b/source/includes/options-mongo.yaml @@ -265,6 +265,8 @@ description: | The default distribution of MongoDB does not contain support for SSL. For more information on MongoDB and SSL, see :doc:`/tutorial/configure-ssl`. + + .. include:: /includes/warning-x509-requires-sslCAfile.rst optional: true --- program: mongo diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml index a73ca58f123..ccf8835038a 100644 --- a/source/includes/options-mongod.yaml +++ b/source/includes/options-mongod.yaml @@ -1243,6 +1243,8 @@ description: | The default distribution of MongoDB does not contain support for SSL. For more information on MongoDB and SSL, see :doc:`/tutorial/configure-ssl`. + + .. include:: /includes/warning-x509-requires-sslCAfile.rst optional: true --- program: mongod diff --git a/source/includes/options-shared.yaml b/source/includes/options-shared.yaml index ac7f8f7cde1..c27fa930fe7 100644 --- a/source/includes/options-shared.yaml +++ b/source/includes/options-shared.yaml @@ -121,6 +121,8 @@ description: | The default distribution of MongoDB does not contain support for SSL. For more information on MongoDB and SSL, see :doc:`/tutorial/configure-ssl`. + + .. include:: /includes/warning-x509-requires-sslCAfile.rst optional: true --- program: _shared diff --git a/source/includes/warning-x509-requires-sslCAfile.rst b/source/includes/warning-x509-requires-sslCAfile.rst index 6267e7b9b6c..560539344b2 100644 --- a/source/includes/warning-x509-requires-sslCAfile.rst +++ b/source/includes/warning-x509-requires-sslCAfile.rst @@ -1,10 +1,11 @@ .. warning:: - If the :setting:`--sslCAFile` option and its target - file are not specified, x.509 client authentication will not function. - :program:`mongod` will not be able to verify the client's certificate - against the trusted certificate authority (CA) that issued it, breaking the - certificate chain. + If the :option:`--sslCAFile ` option and its target + file are not specified, x.509 client and member authentication will not + function. :program:`mongod` (and :program:`mongos` in sharded environments) + will not be able to verify the certificates of processes connecting to it + against the trusted certificate authority (CA) that issued them, breaking + the certificate chain. As of version 2.6.4, :program:`mongod` will not start with x.509 authentication enabled if the CA file is not specified.