Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
d651412d
Commit
d651412d
authored
Apr 20, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: pg db connection problem
parent
cf81ad91
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
db.js
server/core/db.js
+2
-2
No files found.
server/core/db.js
View file @
d651412d
...
...
@@ -39,6 +39,7 @@ module.exports = {
let
sslOptions
=
null
if
(
dbUseSSL
&&
_
.
isPlainObject
(
dbConfig
)
&&
_
.
get
(
dbConfig
,
'sslOptions.auto'
,
null
)
===
false
)
{
sslOptions
=
dbConfig
.
sslOptions
sslOptions
.
rejectUnauthorized
=
_
.
get
(
sslOptions
,
'rejectUnauthorized'
,
true
)
if
(
sslOptions
.
ca
)
{
sslOptions
.
ca
=
fs
.
readFileSync
(
path
.
resolve
(
WIKI
.
ROOTPATH
,
sslOptions
.
ca
))
}
...
...
@@ -60,7 +61,7 @@ module.exports = {
dbClient
=
'pg'
if
(
dbUseSSL
&&
_
.
isPlainObject
(
dbConfig
))
{
dbConfig
.
ssl
=
sslOptions
dbConfig
.
ssl
=
(
sslOptions
===
true
)
?
{
rejectUnauthorized
:
true
}
:
sslOptions
}
break
case
'mariadb'
:
...
...
@@ -106,7 +107,6 @@ module.exports = {
connection
:
dbConfig
,
pool
:
{
...
WIKI
.
config
.
pool
,
propagateCreateError
:
false
,
async
afterCreate
(
conn
,
done
)
{
// -> Set Connection App Name
switch
(
WIKI
.
config
.
db
.
type
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment