Merge pull request #123 from aayanl/frontendssl

Add frontend TLS/SSL
This commit is contained in:
Procrastinator 2017-04-23 11:07:34 -04:00 committed by GitHub
commit 8b33ddd6f1
2 changed files with 26 additions and 9 deletions

View File

@ -42,6 +42,11 @@
"adminCenter": {
"enabled": false,
"password": "password"
},
"tlsOptions" : {
"enabled": false,
"cert": "",
"key": ""
}
},
@ -91,10 +96,10 @@
"diff": 0.001,
"varDiff": {
"minDiff": 0.001,
"maxDiff": 1,
"targetTime": 15,
"retargetTime": 60,
"variancePercent": 30
"maxDiff": 1,
"targetTime": 15,
"retargetTime": 60,
"variancePercent": 30
}
}
}

View File

@ -1,4 +1,4 @@
var https = require('https');
var fs = require('fs');
var path = require('path');
@ -259,7 +259,7 @@ module.exports = function(logger){
else
next();
};
var route = function(req, res, next){
var pageId = req.params.page || '';
if (pageId in indexesProcessed){
@ -295,7 +295,7 @@ module.exports = function(logger){
//app.get('/stats/shares', shares);
//app.get('/payout/:address', payout);
app.get('/workers/:address', minerpage);
app.get('/:page', route);
app.get('/', route);
@ -327,11 +327,23 @@ module.exports = function(logger){
});
try {
app.listen(portalConfig.website.port, portalConfig.website.host, function () {
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 {
var TLSoptions = {
key: fs.readFileSync(portalConfig.website.tlsOptions.key),
cert: fs.readFileSync(portalConfig.website.tlsOptions.cert)
};
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);
});
}
}
catch(e){
console.log(e)
logger.error(logSystem, 'Server', 'Could not start website on ' + portalConfig.website.host + ':' + portalConfig.website.port
+ ' - its either in use or you do not have permission');
}