Skip to content

Commit 8668773

Browse files
committed
Sync some things
1 parent fcb1a9d commit 8668773

5 files changed

Lines changed: 1774 additions & 1054 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.DS_Store
2+
.env
23
*.tar.gz
34
*.log.*
45
t.js

boot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = function (cb) {
4545
authStr += '@'
4646

4747
// authMechanism could be a conf.js parameter to support more mongodb authentication methods
48-
authMechanism = 'DEFAULT'
48+
authMechanism = zenbot.conf.mongo.authMechanism || 'DEFAULT'
4949
}
5050

5151
if (zenbot.conf.mongo.connectionString) {
@@ -68,4 +68,4 @@ module.exports = function (cb) {
6868
_.set(zenbot, 'conf.db.mongo', db)
6969
cb(null, zenbot)
7070
})
71-
}
71+
}

conf-sample.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ c.mongo.username = null
1414
c.mongo.password = null
1515
// 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).
1616
c.mongo.replicaSet = null
17+
c.mongo.authMechanism = null
1718

1819
// default selector. only used if omitting [selector] argument from a command.
1920
c.selector = 'gdax.BTC-USD'

0 commit comments

Comments
 (0)