Merge commit '5ab0088' into merge/master-into-187

OWASP · Nov 18, 2020 · 352234c · 352234c
2 parents ca90515 + 5ab0088
commit 352234c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/apps/server-render/config/env/all.js b/apps/server-render/config/env/all.js
@@ -1,7 +1,10 @@
 // default app configuration
-
 const port = process.env.PORT || 4000;
-let db = process.env.MONGODB_URI || "mongodb://localhost:27017/nodegoat";
+let db = process.env.MONGOLAB_URI || process.env.MONGODB_URI;
+
+if (!db) {
+    db = process.env.NODE_ENV === 'test' ? 'mongodb://localhost:27017/nodegoat' : 'mongodb://nodegoat:[email protected]:27017,nodegoat-cluster-shard-00-01.zkkl5.mongodb.net:27017,nodegoat-cluster-shard-00-02.zkkl5.mongodb.net:27017/nodegoat?ssl=true&replicaSet=atlas-qajmlr-shard-0&authSource=admin&retryWrites=true&w=majority';
+}
 
 module.exports = {
     port,

diff --git a/apps/server-render/package-lock.json b/apps/server-render/package-lock.json