Skip to content

Commit

Permalink
ErizoController ssl configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
aalonsog committed Jul 29, 2015
1 parent 76dfe40 commit 0349780
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
File renamed without changes.
File renamed without changes.
21 changes: 17 additions & 4 deletions erizo_controller/erizoController/erizoController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions extras/basic_example/basicServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 0349780

Please sign in to comment.