channelstream: try to use proxy url's unless ws urls are not explictly defined

This commit is contained in:
Marcin Lulek 2016-09-19 13:48:37 +02:00
parent 1e756c22ff
commit 13cae52005
3 changed files with 17 additions and 6 deletions

View file

@ -420,7 +420,9 @@ channelstream.server = 127.0.0.1:9800
## location of the channelstream server from outside world
## most likely this would be an http server special backend URL, that handles
## websocket connections see nginx example for config
channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
# channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
## proxy path that can be used by http daemons for exposing channelstream
# channelstream.proxy_path = /_channelstream
channelstream.secret = secret
channelstream.history.location = %(here)s/channelstream_history

View file

@ -394,7 +394,9 @@ channelstream.server = 127.0.0.1:9800
## location of the channelstream server from outside world
## most likely this would be an http server special backend URL, that handles
## websocket connections see nginx example for config
channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
# channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
## proxy path that can be used by http daemons for exposing channelstream
# channelstream.proxy_path = /_channelstream
channelstream.secret = secret
channelstream.history.location = %(here)s/channelstream_history