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
56235c63
Commit
56235c63
authored
Feb 14, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: setup incorrectly starting HTTPS server
parent
9384ce14
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
26 deletions
+2
-26
setup.js
server/setup.js
+2
-26
No files found.
server/setup.js
View file @
56235c63
...
...
@@ -380,32 +380,8 @@ module.exports = () => {
app
.
set
(
'port'
,
WIKI
.
config
.
port
)
if
(
WIKI
.
config
.
ssl
.
enabled
)
{
WIKI
.
logger
.
info
(
`HTTPS Server on port: [
${
WIKI
.
config
.
port
}
]`
)
const
tlsOpts
=
{}
try
{
if
(
WIKI
.
config
.
ssl
.
format
===
'pem'
)
{
tlsOpts
.
key
=
fs
.
readFileSync
(
WIKI
.
config
.
ssl
.
key
)
tlsOpts
.
cert
=
fs
.
readFileSync
(
WIKI
.
config
.
ssl
.
cert
)
}
else
{
tlsOpts
.
pfx
=
fs
.
readFileSync
(
WIKI
.
config
.
ssl
.
pfx
)
}
if
(
!
_
.
isEmpty
(
WIKI
.
config
.
ssl
.
passphrase
))
{
tlsOpts
.
passphrase
=
WIKI
.
config
.
ssl
.
passphrase
}
if
(
!
_
.
isEmpty
(
WIKI
.
config
.
ssl
.
dhparam
))
{
tlsOpts
.
dhparam
=
WIKI
.
config
.
ssl
.
dhparam
}
}
catch
(
err
)
{
WIKI
.
logger
.
error
(
'Failed to setup HTTPS server parameters:'
)
WIKI
.
logger
.
error
(
err
)
return
process
.
exit
(
1
)
}
WIKI
.
server
=
https
.
createServer
(
tlsOpts
,
app
)
}
else
{
WIKI
.
logger
.
info
(
`HTTP Server on port: [
${
WIKI
.
config
.
port
}
]`
)
WIKI
.
server
=
http
.
createServer
(
app
)
}
WIKI
.
logger
.
info
(
`HTTP Server on port: [
${
WIKI
.
config
.
port
}
]`
)
WIKI
.
server
=
http
.
createServer
(
app
)
WIKI
.
server
.
listen
(
WIKI
.
config
.
port
,
WIKI
.
config
.
bindIP
)
var
openConnections
=
[]
...
...
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