mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
Attempted to add https support
This commit is contained in:
1 parent
ce0deef83b
commit
61e944b061
1 file changed
+16
-4
@@ -40,6 +40,7 @@ const deepmerge = require("deepmerge");
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const nedb = require("nedb");
|
const nedb = require("nedb");
|
||||||
|
const https = require("https");
|
||||||
|
|
||||||
const jwt = require('jsonwebtoken');
|
const jwt = require('jsonwebtoken');
|
||||||
const bcrypt = require('bcryptjs');
|
const bcrypt = require('bcryptjs');
|
||||||
@@ -840,10 +841,21 @@ app.get("/api/getFactorioLocale", function(req,res){
|
|||||||
httpRequestDurationMilliseconds.labels(req.route.path).observe(Date.now()-reqStartTime);
|
httpRequestDurationMilliseconds.labels(req.route.path).observe(Date.now()-reqStartTime);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
var server = require("http").Server(app);
|
if(config.masterPort == 443){
|
||||||
server.listen(config.masterPort || 8080, function () {
|
var privateKey = fs.readFileSync( 'privatekey.pem' );
|
||||||
console.log("Listening on port %s...", server.address().port);
|
var certificate = fs.readFileSync( 'certificate.pem' );
|
||||||
});
|
|
||||||
|
server = https.createServer({
|
||||||
|
key: privateKey,
|
||||||
|
cert: certificate
|
||||||
|
}, app).listen(443);
|
||||||
|
} else {
|
||||||
|
server = require("http").Server(app);
|
||||||
|
server.listen(config.masterPort || 8080, function () {
|
||||||
|
console.log("Listening on port %s...", server.address().port);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/* Websockets for remoteMap */
|
/* Websockets for remoteMap */
|
||||||
var io = require("socket.io")(server);
|
var io = require("socket.io")(server);
|
||||||
var slaveMappers = {};
|
var slaveMappers = {};
|
||||||
|
|||||||
Reference in new issue
Block a user