Merge pull request #962

Author: jmikola

.travis.scripts/mo.sh

@@ -72,14 +72,7 @@ case $2 in
 start)
     if [ "$HTTP_CODE" != "200" ]
     then
-        WORKSPACE=${TRAVIS_BUILD_DIR}/orchestrations
-        rm -fr $WORKSPACE
-        mkdir $WORKSPACE
-        LOGPATH=$WORKSPACE
-        DBPATH=$WORKSPACE
         POST_DATA=$(eval_params $1)
-        echo "DBPATH=$DBPATH"
-        echo "LOGPATH=$LOGPATH"
         echo "POST_DATA='$POST_DATA'"
         echo
         POST=$(post $BASE_URL/$R "$POST_DATA")

.travis.scripts/setup_mo.sh

@@ -25,7 +25,7 @@ case $DEPLOYMENT in
     ;;
   STANDALONE_SSL)
     ${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/standalone/standalone-ssl.json start > /tmp/mo-result.json
-    cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri, "/?ssl=true&sslallowinvalidcertificates=true";' > /tmp/uri.txt
+    cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri, "/?ssl=true";' > /tmp/uri.txt
     ;;
   REPLICASET)
     ${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/replica_sets/replicaset.json start > /tmp/mo-result.json

.travis.yml

@@ -77,18 +77,19 @@ matrix:
 
 before_install:
   - openssl aes-256-cbc -K $encrypted_b354efda2943_key -iv $encrypted_b354efda2943_iv -in .travis.scripts/atlas-uris.txt.enc -out .travis.scripts/atlas-uris.txt -d || true
-  - pip install "mongo-orchestration>=0.6.7,<1.0" --user `whoami`
+  - pip install --user "mongo-orchestration>=0.6.7,<1.0"
   - .travis.scripts/before_install.sh
   - export SERVER_FILENAME=mongodb-linux-x86_64-${SERVER_DISTRO}-${SERVER_VERSION}
   - wget -qO- http://fastdl.mongodb.org/linux/${SERVER_FILENAME}.tgz | tar xz
   - export PATH=${PWD}/${SERVER_FILENAME}/bin:${PATH}
   - mongod --version
   - mongo-orchestration --version
-  - export MO_PATH=`python -c 'import mongo_orchestration; from os import path;
-    print(path.dirname(mongo_orchestration.__file__));'`
   - php -r 'if ( ! ($f = php_ini_loaded_file())) { $f = PHP_CONFIG_FILE_PATH . "/php.ini"; } file_put_contents($f, "variables_order=EGPCS\n", FILE_APPEND); $a = file($f, FILE_IGNORE_NEW_LINES); var_dump($a[count($a)-1]);'
 
 before_script:
+  - export MONGO_ORCHESTRATION_HOME=${PWD}/orchestration
+  - mkdir -p ${MONGO_ORCHESTRATION_HOME}/lib
+  - cp ${PWD}/scripts/ssl/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
   - mongo-orchestration start
   - .travis.scripts/setup_mo.sh
   - ulimit -a

scripts/presets/standalone-ssl.json

@@ -17,6 +17,6 @@
         "sslMode": "requireSSL",
         "sslCAFile": "/phongo/scripts/ssl/ca.pem",
         "sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
-        "sslWeakCertificateValidation": true
+        "sslAllowConnectionsWithoutCertificates": true
     }
 }

scripts/presets/travis/standalone/standalone-ssl.json

@@ -14,7 +14,6 @@
         "sslMode": "requireSSL",
         "sslCAFile": "$TRAVIS_BUILD_DIR/scripts/ssl/ca.pem",
         "sslPEMKeyFile": "$TRAVIS_BUILD_DIR/scripts/ssl/server.pem",
-        "sslWeakCertificateValidation": true,
-        "sslAllowInvalidHostnames": true
+        "sslAllowConnectionsWithoutCertificates": "true"
     }
 }