summaryrefslogtreecommitdiff
path: root/src/mongo/db/mongod_options.cpp
diff options
context:
space:
mode:
authorSara Golemon <sara.golemon@mongodb.com>2018-07-06 11:34:51 -0400
committerSara Golemon <sara.golemon@mongodb.com>2018-07-09 10:44:50 -0400
commit971aa249002a1a8d2a3311e139594e1825faee55 (patch)
treec22525714fef6b374b62519cd75a1fc545fd0bd7 /src/mongo/db/mongod_options.cpp
parentffbaee1a4dcb47a307986cb696807fe979f4a39d (diff)
downloadmongo-971aa249002a1a8d2a3311e139594e1825faee55.tar.gz
SERVER-35979 Split ssl_otions and decouple from main runtime
Diffstat (limited to 'src/mongo/db/mongod_options.cpp')
-rw-r--r--src/mongo/db/mongod_options.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 85d50af141f..0376b73cee0 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -72,15 +72,6 @@ Status addMongodOptions(moe::OptionSection* options) {
}
#endif
-#ifdef MONGO_CONFIG_SSL
- moe::OptionSection ssl_options("SSL options");
-
- ret = addSSLServerOptions(&ssl_options);
- if (!ret.isOK()) {
- return ret;
- }
-#endif
-
moe::OptionSection rs_options("Replica set options");
moe::OptionSection replication_options("Replication options");
moe::OptionSection sharding_options("Sharding options");
@@ -406,9 +397,6 @@ Status addMongodOptions(moe::OptionSection* options) {
options->addSection(replication_options).transitional_ignore();
options->addSection(rs_options).transitional_ignore();
options->addSection(sharding_options).transitional_ignore();
-#ifdef MONGO_CONFIG_SSL
- options->addSection(ssl_options).transitional_ignore();
-#endif
options->addSection(storage_options).transitional_ignore();
// The following are legacy options that are disallowed in the JSON config file
@@ -544,13 +532,6 @@ Status canonicalizeMongodOptions(moe::Environment* params) {
return ret;
}
-#ifdef MONGO_CONFIG_SSL
- ret = canonicalizeSSLServerOptions(params);
- if (!ret.isOK()) {
- return ret;
- }
-#endif
-
// "storage.journal.enabled" comes from the config file, so override it if any of "journal",
// "nojournal", "dur", and "nodur" are set, since those come from the command line.
if (params->count("journal")) {