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
93c1cb56
Commit
93c1cb56
authored
Jun 01, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: db ssl support
parent
e62ac704
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
config.sample.yml
config.sample.yml
+1
-0
config.yml
dev/build/config.yml
+1
-0
db.js
server/core/db.js
+2
-1
No files found.
config.sample.yml
View file @
93c1cb56
...
@@ -28,6 +28,7 @@ db:
...
@@ -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
...
...
dev/build/config.yml
View file @
93c1cb56
...
@@ -8,5 +8,6 @@ db:
...
@@ -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
server/core/db.js
View file @
93c1cb56
...
@@ -29,7 +29,8 @@ module.exports = {
...
@@ -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
)
{
...
...
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