From 8f942b7c45dbb632a0359971f4c74e1a4d37bfbf Mon Sep 17 00:00:00 2001 From: hellcatz Date: Sun, 23 Apr 2017 11:40:34 -0700 Subject: [PATCH] Update website.js Fix exception when not running TLS website frontend. --- libs/website.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/website.js b/libs/website.js index f07fa3b..2234943 100644 --- a/libs/website.js +++ b/libs/website.js @@ -326,12 +326,8 @@ module.exports = function(logger){ res.send(500, 'Something broke!'); }); - try { - if (typeof portalConfig.website.tlsOptions !== 'undefined' && !portalConfig.website.tlsOptions.enabled) { - app.listen(portalConfig.website.port, portalConfig.website.host, function () { - logger.debug(logSystem, 'Server', 'Website started on ' + portalConfig.website.host + ':' + portalConfig.website.port); - }); - } else { + try { + if (portalConfig.website.tlsOptions && portalConfig.website.tlsOptions.enabled === true) { var TLSoptions = { key: fs.readFileSync(portalConfig.website.tlsOptions.key), cert: fs.readFileSync(portalConfig.website.tlsOptions.cert) @@ -339,7 +335,11 @@ module.exports = function(logger){ https.createServer(TLSoptions, app).listen(portalConfig.website.port, portalConfig.website.host, function() { logger.debug(logSystem, 'Server', 'TLS Website started on ' + portalConfig.website.host + ':' + portalConfig.website.port); - }); + }); + } else { + app.listen(portalConfig.website.port, portalConfig.website.host, function () { + logger.debug(logSystem, 'Server', 'Website started on ' + portalConfig.website.host + ':' + portalConfig.website.port); + }); } } catch(e){