diff --git a/server.js b/server.js index 383183557..e05606374 100644 --- a/server.js +++ b/server.js @@ -13,12 +13,12 @@ var config = require('./config'); config.websocketPort = config.websocketPort || config.httpPort; // support multiple storage back ends -var Storage = require(config.storage || './storage/mongo'); +var Storage = require(config.storage||'./storage/mongo'); var app = Express(); app.use(Express.static(__dirname + '/www')); -Fs.exists(__dirname + "/customize", function(e) { +Fs.exists(__dirname + "/customize", function (e) { if (e) { return; } console.log("Cryptpad is customizable, see customize.dist/readme.md for details"); }); @@ -31,7 +31,7 @@ app.use(/^\/[^\/]*$/, Express.static('customize.dist')); var httpsOpts; if (config.privKeyAndCertFiles) { var privKeyAndCerts = ''; - config.privKeyAndCertFiles.forEach(function(file) { + config.privKeyAndCertFiles.forEach(function (file) { privKeyAndCerts = privKeyAndCerts + Fs.readFileSync(file); }); var array = privKeyAndCerts.split('\n-----BEGIN '); @@ -52,30 +52,30 @@ if (config.privKeyAndCertFiles) { }; } -app.get('/api/config', function(req, res) { +app.get('/api/config', function(req, res){ var host = req.headers.host.replace(/\:[0-9]+/, ''); res.setHeader('Content-Type', 'text/javascript'); res.send('define(' + JSON.stringify({ - websocketURL: 'ws' + ((httpsOpts) ? 's' : '') + '://' + host + ':' + + websocketURL:'ws' + ((httpsOpts) ? 's' : '') + '://' + host + ':' + config.websocketPort + '/cryptpad_websocket', - webrtcURL: 'ws' + ((httpsOpts) ? 's' : '') + '://' + host + ':' + + webrtcURL:'ws' + ((httpsOpts) ? 's' : '') + '://' + host + ':' + config.websocketPort + '/cryptpad_webrtc', }) + ');'); }); var httpServer = httpsOpts ? Https.createServer(httpsOpts, app) : Http.createServer(app); -httpServer.listen(config.httpPort, config.httpAddress, function() { - console.log('listening on %s', config.httpPort); +httpServer.listen(config.httpPort,config.httpAddress,function(){ + console.log('listening on %s',config.httpPort); }); var wsConfig = { server: httpServer }; if (config.websocketPort !== config.httpPort) { console.log("setting up a new websocket server"); - wsConfig = { port: config.websocketPort }; + wsConfig = { port: config.websocketPort}; } var wsSrv = new WebSocketServer(wsConfig); -Storage.create(config, function(store) { +Storage.create(config, function (store) { console.log('DB connected'); NetfluxSrv.run(store, wsSrv, config); WebRTCSrv.run(wsSrv);