ini: synced ini file with latest control changes
This commit is contained in:
parent
18125202da
commit
83cb954619
1 changed files with 21 additions and 19 deletions
|
|
@ -389,19 +389,23 @@ search.location = %(here)s/data/index
|
|||
########################################
|
||||
## channelstream enables persistent connections and live notification
|
||||
## in the system. It's also used by the chat system
|
||||
|
||||
channelstream.enabled = false
|
||||
## location of channelstream server on the backend
|
||||
|
||||
## server address for channelstream server on the backend
|
||||
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
|
||||
## proxy path that can be used by http daemons for exposing channelstream
|
||||
# channelstream.proxy_path = /_channelstream
|
||||
## use ws:// for http or wss:// for https. This address needs to be handled
|
||||
## by external HTTP server such as Nginx or Apache
|
||||
## see nginx/apache configuration examples in our docs
|
||||
channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
|
||||
channelstream.secret = secret
|
||||
channelstream.history.location = %(here)s/channelstream_history
|
||||
|
||||
## Internal application path that Javascript uses to connect into.
|
||||
## If you use proxy-prefix the prefix should be added before /_channelstream
|
||||
channelstream.proxy_path = /_channelstream
|
||||
|
||||
|
||||
###################################
|
||||
## APPENLIGHT CONFIG ##
|
||||
|
|
@ -470,9 +474,9 @@ appenlight.log_namespace_blacklist =
|
|||
set debug = false
|
||||
|
||||
|
||||
#########################################################
|
||||
### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ###
|
||||
#########################################################
|
||||
###########################################
|
||||
### MAIN RHODECODE DATABASE CONFIG ###
|
||||
###########################################
|
||||
#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
|
||||
#sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
|
||||
#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
|
||||
|
|
@ -555,12 +559,16 @@ svn.proxy.location_root = /
|
|||
## be killed. Setting it to zero means no timeout. Defaults to 10 seconds.
|
||||
#svn.proxy.reload_timeout = 10
|
||||
|
||||
## Dummy marker to add new entries after.
|
||||
## Add any custom entries below. Please don't remove.
|
||||
custom.conf = 1
|
||||
|
||||
|
||||
################################
|
||||
### LOGGING CONFIGURATION ####
|
||||
################################
|
||||
[loggers]
|
||||
keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
|
||||
keys = root, routes, rhodecode, sqlalchemy, beaker, templates
|
||||
|
||||
[handlers]
|
||||
keys = console, console_sql
|
||||
|
|
@ -588,12 +596,6 @@ handlers =
|
|||
qualname = beaker.container
|
||||
propagate = 1
|
||||
|
||||
[logger_pyro4]
|
||||
level = DEBUG
|
||||
handlers =
|
||||
qualname = Pyro4
|
||||
propagate = 1
|
||||
|
||||
[logger_templates]
|
||||
level = INFO
|
||||
handlers =
|
||||
|
|
@ -618,13 +620,13 @@ propagate = 0
|
|||
|
||||
[handler_console]
|
||||
class = StreamHandler
|
||||
args = (sys.stderr,)
|
||||
args = (sys.stderr, )
|
||||
level = INFO
|
||||
formatter = generic
|
||||
|
||||
[handler_console_sql]
|
||||
class = StreamHandler
|
||||
args = (sys.stderr,)
|
||||
args = (sys.stderr, )
|
||||
level = WARN
|
||||
formatter = generic
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue