diff --git a/config.js.dist b/config.js.dist index b015b55be..95ba7ed49 100644 --- a/config.js.dist +++ b/config.js.dist @@ -17,7 +17,7 @@ module.exports = { /* httpHeaders: { "Content-Security-Policy": [ - "default-serc 'none'", + "default-src 'none'", "style-src 'unsafe-inline' 'self'", "script-src 'self' 'unsafe-eval' 'unsafe-inline'", "child-src 'self' cryptpad.fr *.cryptpad.fr", @@ -50,6 +50,12 @@ module.exports = { */ //websocketPort: 3000, + /* if you want to run a different version of cryptpad but using the same websocket + * server, you should use the other server port as websocketPort and disable + * the websockets on that server + */ + //useExternalWebsocket: false, + /* If Cryptpad is proxied without using https, the server needs to know. * Specify 'useSecureWebsockets: true' so that it can send * Content Security Policy Headers that prevent http and https from mixing diff --git a/server.js b/server.js index 2be619e48..6414c83bc 100644 --- a/server.js +++ b/server.js @@ -82,7 +82,7 @@ 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({ - websocketPath: config.websocketPath, + websocketPath: config.useExternalWebsocket ? undefined : config.websocketPath, websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' + websocketPort + '/cryptpad_websocket', }) + ');'); @@ -95,11 +95,14 @@ httpServer.listen(config.httpPort,config.httpAddress,function(){ }); var wsConfig = { server: httpServer }; -if (websocketPort !== config.httpPort) { - console.log("setting up a new websocket server"); - wsConfig = { port: websocketPort}; + +if(!config.useExternalWebsocket) { + if (websocketPort !== config.httpPort) { + console.log("setting up a new websocket server"); + wsConfig = { port: websocketPort}; + } + var wsSrv = new WebSocketServer(wsConfig); + Storage.create(config, function (store) { + NetfluxSrv.run(store, wsSrv, config); + }); } -var wsSrv = new WebSocketServer(wsConfig); -Storage.create(config, function (store) { - NetfluxSrv.run(store, wsSrv, config); -}); diff --git a/www/code/index.html b/www/code/index.html index 847ac2ec6..b4b1e025f 100644 --- a/www/code/index.html +++ b/www/code/index.html @@ -47,7 +47,10 @@
- + +
diff --git a/www/pad/index.html b/www/pad/index.html index 7d4c3125a..e3064d18b 100644 --- a/www/pad/index.html +++ b/www/pad/index.html @@ -60,7 +60,10 @@ - + + diff --git a/www/slide/index.html b/www/slide/index.html index 1af49e2ab..c5f2f0fd6 100644 --- a/www/slide/index.html +++ b/www/slide/index.html @@ -51,7 +51,10 @@
- + +