From 93c1cb5645585b4a95f76d171a7358affe4e601c Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 1 Jun 2019 00:23:07 -0400 Subject: [PATCH] feat: db ssl support --- config.sample.yml | 1 + dev/build/config.yml | 1 + server/core/db.js | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config.sample.yml b/config.sample.yml index 438a6a1e..3b74072d 100644 --- a/config.sample.yml +++ b/config.sample.yml @@ -28,6 +28,7 @@ db: user: wikijs pass: wikijsrocks db: wiki + ssl: false # SQLite only: storage: path/to/database.sqlite diff --git a/dev/build/config.yml b/dev/build/config.yml index 40e8efc6..46f1a868 100644 --- a/dev/build/config.yml +++ b/dev/build/config.yml @@ -8,5 +8,6 @@ db: pass: $(DB_PASS) db: $(DB_NAME) storage: $(DB_FILEPATH) + ssl: $(DB_SSL) trustProxy: $(TRUST_PROXY) logLevel: info diff --git a/server/core/db.js b/server/core/db.js index cecc8ab0..9b8a8770 100644 --- a/server/core/db.js +++ b/server/core/db.js @@ -29,7 +29,8 @@ module.exports = { user: WIKI.config.db.user, password: WIKI.config.db.pass, 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) {