From 56235c6354a7982818b523a433a2a43d3f8c0e79 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 14 Feb 2020 15:47:19 -0500 Subject: [PATCH] fix: setup incorrectly starting HTTPS server --- server/setup.js | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/server/setup.js b/server/setup.js index c3f168bb..8b437dcc 100644 --- a/server/setup.js +++ b/server/setup.js @@ -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 = []