web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop support for 'websocketPath' and 'useExternalWebsocket' configuration points

Browse Source
This commit is contained in:
ansuz 2019-12-23 18:23:50 -05:00
parent 97bc793ca8
commit a8b363dba0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/config.example.js
View File

@ -97,15 +97,17 @@ module.exports = {
httpUnsafeOrigin: domain, httpUnsafeOrigin: domain,
/* your server's websocket url is configurable /* Your CryptPad server will share this value with clients
* (default: '/cryptpad_websocket') * via its /api/config endpoint.
* *
* websocketPath can be relative, of the form '/path/to/websocket' * If you want to host your API and asset servers on different hosts
* or absolute, specifying a particular URL * specify a URL for your API server websocket endpoint, like so:
* wss://api.yourdomain.com/cryptpad_websocket
* *
* 'wss://cryptpad.fr:3000/cryptpad_websocket' * Otherwise, leave this commented and your clients will use the default
* websocket (wss://yourdomain.com/cryptpad_websocket)
*/ */
websocketPath: '/cryptpad_websocket', //externalWebsocketPath: 'wss://api.yourdomain.com/cryptpad_websocket
/* CryptPad can be configured to send customized HTTP Headers /* CryptPad can be configured to send customized HTTP Headers
* These settings may vary widely depending on your needs * These settings may vary widely depending on your needs

4
server.js
View File

@ -166,7 +166,7 @@ app.get('/api/config', function(req, res){
}, },
removeDonateButton: (config.removeDonateButton === true), removeDonateButton: (config.removeDonateButton === true),
allowSubscriptions: (config.allowSubscriptions === true), allowSubscriptions: (config.allowSubscriptions === true),
websocketPath: config.websocketPath, websocketPath: config.externalWebsocketPath,
httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^\s*/, ''), httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^\s*/, ''),
adminEmail: config.adminEmail, adminEmail: config.adminEmail,
adminKeys: admins, adminKeys: admins,
@ -234,7 +234,7 @@ var nt = nThen(function (w) {
log = config.log = _log; log = config.log = _log;
})); }));
}).nThen(function (w) { }).nThen(function (w) {
if (config.useExternalWebsocket) { if (config.externalWebsocketPath) {
// if you plan to use an external websocket server // if you plan to use an external websocket server
// then you don't need to load any API services other than the logger. // then you don't need to load any API services other than the logger.
// Just abort. // Just abort.