diff --git a/CHANGELOG.md b/CHANGELOG.md index ea5909dab..649e18d02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) We had some trouble finding an extinct animal whose name started with "I", and we had to resort to using a scientific name. diff --git a/config/config.example.js b/config/config.example.js index 2b5bc687d..c76fe9d37 100644 --- a/config/config.example.js +++ b/config/config.example.js @@ -107,7 +107,7 @@ module.exports = { * Otherwise, leave this commented and your clients will use the default * 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 * These settings may vary widely depending on your needs diff --git a/server.js b/server.js index 8a9a98a41..65bf36a87 100644 --- a/server.js +++ b/server.js @@ -166,7 +166,7 @@ app.get('/api/config', function(req, res){ }, removeDonateButton: (config.removeDonateButton === true), allowSubscriptions: (config.allowSubscriptions === true), - websocketPath: config.externalWebsocketPath, + websocketPath: config.externalWebsocketURL, httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^\s*/, ''), adminEmail: config.adminEmail, adminKeys: admins, @@ -234,7 +234,7 @@ var nt = nThen(function (w) { log = config.log = _log; })); }).nThen(function (w) { - if (config.externalWebsocketPath) { + if (config.externalWebsocketURL) { // if you plan to use an external websocket server // then you don't need to load any API services other than the logger. // Just abort.