diff options
Diffstat (limited to 'src/mongo/shell/servers_misc.js')
-rw-r--r-- | src/mongo/shell/servers_misc.js | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/mongo/shell/servers_misc.js b/src/mongo/shell/servers_misc.js index 2a652ce8662..8c338e8285b 100644 --- a/src/mongo/shell/servers_misc.js +++ b/src/mongo/shell/servers_misc.js @@ -163,26 +163,6 @@ ReplTest.prototype.getOptions = function( master , extra , putBinaryFirst, norep a.push( jsTestOptions().keyFile ) } - if( jsTestOptions().useSSL ) { - if (!a.contains("--sslMode")) { - a.push( "--sslMode" ) - a.push( "requireSSL" ) - } - if (!a.contains("--sslPEMKeyFile")) { - a.push( "--sslPEMKeyFile" ) - a.push( "jstests/libs/server.pem" ) - } - if (!a.contains("--sslCAFile")) { - a.push( "--sslCAFile" ) - a.push( "jstests/libs/ca.pem" ) - } - a.push( "--sslWeakCertificateValidation" ) - } - if( jsTestOptions().useX509 && !a.contains("--clusterAuthMode")) { - a.push( "--clusterAuthMode" ) - a.push( "x509" ) - } - if ( !norepl ) { if ( master ){ a.push( "--master" ); @@ -218,7 +198,7 @@ ReplTest.prototype.start = function( master , options , restart, norepl ){ return conn; } else { var conn = startMongod.apply(null, o); - if (jsTestOptions().keyFile || jsTestOptions().auth || jsTestOptions().useX509) { + if (jsTestOptions().keyFile || jsTestOptions().auth) { jsTest.authenticate(conn); } if (!master) { @@ -331,14 +311,6 @@ function startParallelShell( jsCode, port, noConnect ){ args.push("--port", port); } - if( jsTestOptions().useSSL ) { - args.push( "--ssl" ) - args.push( "--sslPEMKeyFile" ) - args.push( "jstests/libs/client.pem" ) - args.push( "--sslCAFile" ) - args.push( "jstests/libs/ca.pem" ) - } - x = startMongoProgramNoConnect.apply(null, args); return function(){ return waitProgram( x ); |