##// END OF EJS Templates
ini: synced ini file with latest control changes
marcink -
r1264:75bb007e default
parent child Browse files
Show More
@@ -389,19 +389,23 b' search.location = %(here)s/data/index'
389 389 ########################################
390 390 ## channelstream enables persistent connections and live notification
391 391 ## in the system. It's also used by the chat system
392 channelstream.enabled = false
392 393
393 channelstream.enabled = false
394 ## location of channelstream server on the backend
394 ## server address for channelstream server on the backend
395 395 channelstream.server = 127.0.0.1:9800
396
396 397 ## location of the channelstream server from outside world
397 ## most likely this would be an http server special backend URL, that handles
398 ## websocket connections see nginx example for config
399 # channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
400 ## proxy path that can be used by http daemons for exposing channelstream
401 # channelstream.proxy_path = /_channelstream
398 ## use ws:// for http or wss:// for https. This address needs to be handled
399 ## by external HTTP server such as Nginx or Apache
400 ## see nginx/apache configuration examples in our docs
401 channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
402 402 channelstream.secret = secret
403 403 channelstream.history.location = %(here)s/channelstream_history
404 404
405 ## Internal application path that Javascript uses to connect into.
406 ## If you use proxy-prefix the prefix should be added before /_channelstream
407 channelstream.proxy_path = /_channelstream
408
405 409
406 410 ###################################
407 411 ## APPENLIGHT CONFIG ##
@@ -470,9 +474,9 b' appenlight.log_namespace_blacklist ='
470 474 set debug = false
471 475
472 476
473 #########################################################
474 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ###
475 #########################################################
477 ###########################################
478 ### MAIN RHODECODE DATABASE CONFIG ###
479 ###########################################
476 480 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
477 481 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
478 482 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
@@ -555,12 +559,16 b' svn.proxy.location_root = /'
555 559 ## be killed. Setting it to zero means no timeout. Defaults to 10 seconds.
556 560 #svn.proxy.reload_timeout = 10
557 561
562 ## Dummy marker to add new entries after.
563 ## Add any custom entries below. Please don't remove.
564 custom.conf = 1
565
558 566
559 567 ################################
560 568 ### LOGGING CONFIGURATION ####
561 569 ################################
562 570 [loggers]
563 keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
571 keys = root, routes, rhodecode, sqlalchemy, beaker, templates
564 572
565 573 [handlers]
566 574 keys = console, console_sql
@@ -588,12 +596,6 b' handlers ='
588 596 qualname = beaker.container
589 597 propagate = 1
590 598
591 [logger_pyro4]
592 level = DEBUG
593 handlers =
594 qualname = Pyro4
595 propagate = 1
596
597 599 [logger_templates]
598 600 level = INFO
599 601 handlers =
General Comments 0
You need to be logged in to leave comments. Login now