Merge branch 'sync' into unstable

DeviaVir · Apr 23, 2018 · fd0e24a · fd0e24a
2 parents fcb1a9d + 8668773
commit fd0e24a
Show file tree

Hide file tree

Showing 5 changed files with 1,774 additions and 1,054 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.env
 *.tar.gz
 *.log.*
 t.js

diff --git a/boot.js b/boot.js
@@ -45,7 +45,7 @@ module.exports = function (cb) {
     authStr += '@'
 
     // authMechanism could be a conf.js parameter to support more mongodb authentication methods
-    authMechanism = 'DEFAULT'
+    authMechanism = zenbot.conf.mongo.authMechanism || 'DEFAULT'
   }
 
   if (zenbot.conf.mongo.connectionString) {
@@ -68,4 +68,4 @@ module.exports = function (cb) {
     _.set(zenbot, 'conf.db.mongo', db)
     cb(null, zenbot)
   })
-}
+}
diff --git a/conf-sample.js b/conf-sample.js
@@ -14,6 +14,7 @@ c.mongo.username = null
 c.mongo.password = null
 // when using mongodb replication, i.e. when running a mongodb cluster, you can define your replication set here; when you are not using replication (most of the users), just set it to `null` (default).
 c.mongo.replicaSet = null
+c.mongo.authMechanism = null
 
 // default selector. only used if omitting [selector] argument from a command.
 c.selector = 'gdax.BTC-USD'