remove password from clsi for sql

sequalise fails when it is set to null
This commit is contained in:
Henry Oswald 2018-07-30 14:04:33 +01:00
parent 3b06835499
commit 1ef8ea328c
5 changed files with 2407 additions and 110 deletions

View file

@ -12,5 +12,7 @@ app.js
cache cache
.vagrant .vagrant
db.sqlite db.sqlite
db.sqlite-wal
db.sqlite-shm
config/* config/*
npm-debug.log npm-debug.log

View file

@ -42,4 +42,10 @@ module.exports =
sync: () -> sync: () ->
logger.log dbPath:Settings.mysql.clsi.storage, "syncing db schema" logger.log dbPath:Settings.mysql.clsi.storage, "syncing db schema"
sequelize.sync() sequelize.sync()
.then(->
logger.log "db sync complete"
).catch((err)->
console.log err, "error syncing"
)

View file

@ -7,12 +7,11 @@ module.exports =
clsi: clsi:
database: "clsi" database: "clsi"
username: "clsi" username: "clsi"
password: null
dialect: "sqlite" dialect: "sqlite"
storage: process.env["SQLITE_PATH"] or Path.resolve(__dirname + "/../db.sqlite") storage: process.env["SQLITE_PATH"] or Path.resolve(__dirname + "/../db.sqlite")
pool: pool:
max: 1 max: 1
min: 0 min: 1
retry: retry:
max: 10 max: 10

File diff suppressed because it is too large Load diff

View file

@ -35,10 +35,10 @@
"mkdirp": "0.3.5", "mkdirp": "0.3.5",
"mysql": "2.6.2", "mysql": "2.6.2",
"request": "^2.21.0", "request": "^2.21.0",
"sequelize": "4.38.0", "sequelize": "^4.38.0",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
"smoke-test-sharelatex": "git+https://github.com/sharelatex/smoke-test-sharelatex.git#v0.2.0", "smoke-test-sharelatex": "git+https://github.com/sharelatex/smoke-test-sharelatex.git#v0.2.0",
"sqlite3": "4.0.2", "sqlite3": "^4.0.2",
"underscore": "^1.8.2", "underscore": "^1.8.2",
"v8-profiler": "^5.2.4", "v8-profiler": "^5.2.4",
"wrench": "~1.5.4" "wrench": "~1.5.4"