##// END OF EJS Templates
ini: synced with latest changes
marcink -
r1279:a8d37de3 default
parent child Browse files
Show More
@@ -415,19 +415,23 b' search.location = %(here)s/data/index'
415 ########################################
415 ########################################
416 ## channelstream enables persistent connections and live notification
416 ## channelstream enables persistent connections and live notification
417 ## in the system. It's also used by the chat system
417 ## in the system. It's also used by the chat system
418 channelstream.enabled = false
418
419
419 channelstream.enabled = false
420 ## server address for channelstream server on the backend
420 ## location of channelstream server on the backend
421 channelstream.server = 127.0.0.1:9800
421 channelstream.server = 127.0.0.1:9800
422
422 ## location of the channelstream server from outside world
423 ## location of the channelstream server from outside world
423 ## most likely this would be an http server special backend URL, that handles
424 ## use ws:// for http or wss:// for https. This address needs to be handled
424 ## websocket connections see nginx example for config
425 ## by external HTTP server such as Nginx or Apache
425 # channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
426 ## see nginx/apache configuration examples in our docs
426 ## proxy path that can be used by http daemons for exposing channelstream
427 channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
427 # channelstream.proxy_path = /_channelstream
428 channelstream.secret = secret
428 channelstream.secret = secret
429 channelstream.history.location = %(here)s/channelstream_history
429 channelstream.history.location = %(here)s/channelstream_history
430
430
431 ## Internal application path that Javascript uses to connect into.
432 ## If you use proxy-prefix the prefix should be added before /_channelstream
433 channelstream.proxy_path = /_channelstream
434
431
435
432 ###################################
436 ###################################
433 ## APPENLIGHT CONFIG ##
437 ## APPENLIGHT CONFIG ##
@@ -501,9 +505,9 b' appenlight.log_namespace_blacklist ='
501 ##############
505 ##############
502 debug_style = true
506 debug_style = true
503
507
504 #########################################################
508 ###########################################
505 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ###
509 ### MAIN RHODECODE DATABASE CONFIG ###
506 #########################################################
510 ###########################################
507 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
511 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
508 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
512 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
509 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
513 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
@@ -586,12 +590,16 b' svn.proxy.location_root = /'
586 ## be killed. Setting it to zero means no timeout. Defaults to 10 seconds.
590 ## be killed. Setting it to zero means no timeout. Defaults to 10 seconds.
587 #svn.proxy.reload_timeout = 10
591 #svn.proxy.reload_timeout = 10
588
592
593 ## Dummy marker to add new entries after.
594 ## Add any custom entries below. Please don't remove.
595 custom.conf = 1
596
589
597
590 ################################
598 ################################
591 ### LOGGING CONFIGURATION ####
599 ### LOGGING CONFIGURATION ####
592 ################################
600 ################################
593 [loggers]
601 [loggers]
594 keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
602 keys = root, routes, rhodecode, sqlalchemy, beaker, templates
595
603
596 [handlers]
604 [handlers]
597 keys = console, console_sql
605 keys = console, console_sql
@@ -619,12 +627,6 b' handlers ='
619 qualname = beaker.container
627 qualname = beaker.container
620 propagate = 1
628 propagate = 1
621
629
622 [logger_pyro4]
623 level = DEBUG
624 handlers =
625 qualname = Pyro4
626 propagate = 1
627
628 [logger_templates]
630 [logger_templates]
629 level = INFO
631 level = INFO
630 handlers =
632 handlers =
General Comments 0
You need to be logged in to leave comments. Login now