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

unify websocket configuration points

Browse Source
This commit is contained in:
ansuz 2019-12-23 18:27:11 -05:00
parent a8b363dba0
commit 05699b2c94
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@ -1,3 +1,17 @@
# J release (3.9.0)
## Goals
* simplify server configuration by dropping support for unused features
* drop `websocketPath` `websocketURL` and `useExternalWebsockets`
* use `externalWebsocketURL` to replace all of these
## Update notes
## Features
## Bug fixes
# IsolobodonPortoricensis release (3.8.0) # IsolobodonPortoricensis release (3.8.0)
We had some trouble finding an extinct animal whose name started with "I", and we had to resort to using a scientific name. We had some trouble finding an extinct animal whose name started with "I", and we had to resort to using a scientific name.

2
config/config.example.js
View File

@ -107,7 +107,7 @@ module.exports = {
* Otherwise, leave this commented and your clients will use the default * Otherwise, leave this commented and your clients will use the default
* websocket (wss://yourdomain.com/cryptpad_websocket) * websocket (wss://yourdomain.com/cryptpad_websocket)
*/ */
//externalWebsocketPath: 'wss://api.yourdomain.com/cryptpad_websocket //externalWebsocketURL: '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.externalWebsocketPath, websocketPath: config.externalWebsocketURL,
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.externalWebsocketPath) { if (config.externalWebsocketURL) {
// 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.