diff --git a/extras/basic_example/cert/cert.pem b/cert/cert.pem similarity index 100% rename from extras/basic_example/cert/cert.pem rename to cert/cert.pem diff --git a/extras/basic_example/cert/key.pem b/cert/key.pem similarity index 100% rename from extras/basic_example/cert/key.pem rename to cert/key.pem diff --git a/erizo_controller/erizoController/erizoController.js b/erizo_controller/erizoController/erizoController.js index 0cb67fdfff..9800419af3 100644 --- a/erizo_controller/erizoController/erizoController.js +++ b/erizo_controller/erizoController/erizoController.js @@ -2,9 +2,6 @@ var crypto = require('crypto'); var rpcPublic = require('./rpc/rpcPublic'); var ST = require('./Stream'); -var http = require('http'); -var server = http.createServer(); -var io = require('socket.io').listen(server, {log:false}); var config = require('./../../licode_config'); var Permission = require('./permission'); var Getopt = require('node-getopt'); @@ -91,7 +88,23 @@ var controller = require('./roomController'); // Logger var log = logger.getLogger("ErizoController"); -server.listen(8080); +var server; + +if (GLOBAL.config.erizoController.ssl) { + var https = require('https'); + var fs = require('fs'); + var options = { + key: fs.readFileSync('../../cert/key.pem').toString(), + cert: fs.readFileSync('../../cert/cert.pem').toString() + }; + server = https.createServer(options); +} else { + var http = require('http'); + server = http.createServer(); +} + +server.listen(GLOBAL.config.erizoController.port); +var io = require('socket.io').listen(server, {log:false}); io.set('log level', 0); diff --git a/extras/basic_example/basicServer.js b/extras/basic_example/basicServer.js index cdcb084026..2f833f67d3 100644 --- a/extras/basic_example/basicServer.js +++ b/extras/basic_example/basicServer.js @@ -10,8 +10,8 @@ var express = require('express'), config = require('./../../licode_config'); var options = { - key: fs.readFileSync('cert/key.pem').toString(), - cert: fs.readFileSync('cert/cert.pem').toString() + key: fs.readFileSync('../../cert/key.pem').toString(), + cert: fs.readFileSync('../../cert/cert.pem').toString() }; var app = express();