Show More
@@ -476,14 +476,14 b' search.location = %(here)s/data/index' | |||||
476 | channelstream.enabled = false |
|
476 | channelstream.enabled = false | |
477 |
|
477 | |||
478 | ; server address for channelstream server on the backend |
|
478 | ; server address for channelstream server on the backend | |
479 |
channelstream.server = |
|
479 | channelstream.server = channelstream:9800 | |
480 |
|
480 | |||
481 | ; location of the channelstream server from outside world |
|
481 | ; location of the channelstream server from outside world | |
482 | ; use ws:// for http or wss:// for https. This address needs to be handled |
|
482 | ; use ws:// for http or wss:// for https. This address needs to be handled | |
483 | ; by external HTTP server such as Nginx or Apache |
|
483 | ; by external HTTP server such as Nginx or Apache | |
484 | ; see Nginx/Apache configuration examples in our docs |
|
484 | ; see Nginx/Apache configuration examples in our docs | |
485 | channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream |
|
485 | channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream | |
486 |
channelstream.secret = |
|
486 | channelstream.secret = ENV_GENERATED | |
487 | channelstream.history.location = %(here)s/channelstream_history |
|
487 | channelstream.history.location = %(here)s/channelstream_history | |
488 |
|
488 | |||
489 | ; Internal application path that Javascript uses to connect into. |
|
489 | ; Internal application path that Javascript uses to connect into. | |
@@ -543,6 +543,7 b' vcs.scm_app_implementation = http' | |||||
543 |
|
543 | |||
544 | ; Push/Pull operations hooks protocol, available options are: |
|
544 | ; Push/Pull operations hooks protocol, available options are: | |
545 | ; `http` - use http-rpc backend (default) |
|
545 | ; `http` - use http-rpc backend (default) | |
|
546 | ; `celery` - use celery based hooks | |||
546 | vcs.hooks.protocol = http |
|
547 | vcs.hooks.protocol = http | |
547 |
|
548 | |||
548 | ; Host on which this instance is listening for hooks. vcsserver will call this host to pull/push hooks so it should be |
|
549 | ; Host on which this instance is listening for hooks. vcsserver will call this host to pull/push hooks so it should be | |
@@ -629,7 +630,8 b' ssh.authorized_keys_file_path = %(here)s' | |||||
629 |
|
630 | |||
630 | ; Command to execute the SSH wrapper. The binary is available in the |
|
631 | ; Command to execute the SSH wrapper. The binary is available in the | |
631 | ; RhodeCode installation directory. |
|
632 | ; RhodeCode installation directory. | |
632 |
; e |
|
633 | ; legacy: /usr/local/bin/rhodecode_bin/bin/rc-ssh-wrapper | |
|
634 | ; new rewrite: /usr/local/bin/rhodecode_bin/bin/rc-ssh-wrapper-v2 | |||
633 | ssh.wrapper_cmd = /usr/local/bin/rhodecode_bin/bin/rc-ssh-wrapper |
|
635 | ssh.wrapper_cmd = /usr/local/bin/rhodecode_bin/bin/rc-ssh-wrapper | |
634 |
|
636 | |||
635 | ; Allow shell when executing the ssh-wrapper command |
|
637 | ; Allow shell when executing the ssh-wrapper command |
General Comments 0
You need to be logged in to leave comments.
Login now