Skip to content
Snippets Groups Projects
Commit b36e6ad7 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Merge branch 'ws-proxy-support' into 'master'

Add proxy support for WebSocket connections

Configuration for Socket.IO has been refactored to support proxies and
replace ambiguous property names:
* Added API property `socketioPath` to `/configuration/`
* Added property `socketio.proxy-path`
* Removed property `security.ssl`
* Renamed properties:
  * `socketio.ip` -> `socketio.bind-address`
  * `security.keystore` -> `socketio.ssl.jks-file`
  * `security.storepass` -> `socketio.ssl.jks-password`

The default port to bind to has been changed from 10443 to 8090 since
SSL is not enabled by default. There is enough room (8081-8089) for
additional severs (e.g. `grunt run`) in development environments.

See merge request !27
parents 7a1265ea c056ae19
Pipeline #3343 passed with stages
in 3 minutes and 50 seconds