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

feat: db ssl support

Browse Source
This commit is contained in:
Nick
2019-06-01 00:23:07 -04:00
parent e62ac70464
commit 93c1cb5645
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.sample.yml
View File

@@ -28,6 +28,7 @@ db:
user: wikijs user: wikijs
pass: wikijsrocks pass: wikijsrocks
db: wiki db: wiki
ssl: false
# SQLite only: # SQLite only:
storage: path/to/database.sqlite storage: path/to/database.sqlite

1
dev/build/config.yml
View File

@@ -8,5 +8,6 @@ db:
pass: $(DB_PASS) pass: $(DB_PASS)
db: $(DB_NAME) db: $(DB_NAME)
storage: $(DB_FILEPATH) storage: $(DB_FILEPATH)
ssl: $(DB_SSL)
trustProxy: $(TRUST_PROXY) trustProxy: $(TRUST_PROXY)
logLevel: info logLevel: info

3
server/core/db.js
View File

@@ -29,7 +29,8 @@ module.exports = {
user: WIKI.config.db.user, user: WIKI.config.db.user,
password: WIKI.config.db.pass, password: WIKI.config.db.pass,
database: WIKI.config.db.db, database: WIKI.config.db.db,
port: WIKI.config.db.port port: WIKI.config.db.port,
ssl: !_.isNil(WIKI.config.db.ssl) && WIKI.config.db.ssl !== false
} }
switch (WIKI.config.db.type) { switch (WIKI.config.db.type) {