liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: pg db connection problem

Browse Source
This commit is contained in:
NGPixel
2020-04-20 17:51:27 -04:00
parent cf81ad910d
commit d651412d34
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/db.js
View File

@@ -39,6 +39,7 @@ module.exports = {
let sslOptions = null let sslOptions = null
if (dbUseSSL && _.isPlainObject(dbConfig) && _.get(dbConfig, 'sslOptions.auto', null) === false) { if (dbUseSSL && _.isPlainObject(dbConfig) && _.get(dbConfig, 'sslOptions.auto', null) === false) {
sslOptions = dbConfig.sslOptions sslOptions = dbConfig.sslOptions
sslOptions.rejectUnauthorized = _.get(sslOptions, 'rejectUnauthorized', true)
if (sslOptions.ca) { if (sslOptions.ca) {
sslOptions.ca = fs.readFileSync(path.resolve(WIKI.ROOTPATH, sslOptions.ca)) sslOptions.ca = fs.readFileSync(path.resolve(WIKI.ROOTPATH, sslOptions.ca))
} }
@@ -60,7 +61,7 @@ module.exports = {
dbClient = 'pg' dbClient = 'pg'
if (dbUseSSL && _.isPlainObject(dbConfig)) { if (dbUseSSL && _.isPlainObject(dbConfig)) {
dbConfig.ssl = sslOptions dbConfig.ssl = (sslOptions === true) ? { rejectUnauthorized: true } : sslOptions
} }
break break
case 'mariadb': case 'mariadb':
@@ -106,7 +107,6 @@ module.exports = {
connection: dbConfig, connection: dbConfig,
pool: { pool: {
...WIKI.config.pool, ...WIKI.config.pool,
propagateCreateError: false,
async afterCreate(conn, done) { async afterCreate(conn, done) {
// -> Set Connection App Name // -> Set Connection App Name
switch (WIKI.config.db.type) { switch (WIKI.config.db.type) {