# HG changeset patch # User Marcin Kuzminski # Date 2016-11-28 17:49:10 # Node ID c044d81493255718f9a1b2f1f6077d32622935ce # Parent ef1cd4f93e0315f4a9af5fa83b299a4d462bd5b5 configuration: synced ini configuration changes diff --git a/configs/development.ini b/configs/development.ini --- a/configs/development.ini +++ b/configs/development.ini @@ -1,7 +1,7 @@ ################################################################################ -## RHODECODE ENTERPRISE CONFIGURATION ## +## RHODECODE COMMUNITY EDITION CONFIGURATION ## # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ @@ -94,8 +94,10 @@ asyncore_use_poll = true ## prefix middleware for RhodeCode. ## recommended when using proxy setup. ## allows to set RhodeCode under a prefix in server. -## eg https://server.com/. Enable `filter-with =` option below as well. -## optionally set prefix like: `prefix = /` +## eg https://server.com/custom_prefix. Enable `filter-with =` option below as well. +## And set your prefix like: `prefix = /custom_prefix` +## be sure to also set beaker.session.cookie_path = /custom_prefix if you need +## to make your cookies only work on prefix url [filter:proxy-prefix] use = egg:PasteDeploy#prefix prefix = / @@ -194,17 +196,17 @@ rss_items_per_page = 10 rss_include_diff = false ## gist URL alias, used to create nicer urls for gist. This should be an -## url that does rewrites to _admin/gists/. +## url that does rewrites to _admin/gists/{gistid}. ## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/ +## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/{gistid} gist_alias_url = ## List of controllers (using glob pattern syntax) that AUTH TOKENS could be ## used for access. -## Adding ?auth_token = to the url authenticates this request as if it +## Adding ?auth_token=TOKEN_HASH to the url authenticates this request as if it ## came from the the logged in user who own this authentication token. ## -## Syntax is :. +## Syntax is ControllerClass:function_pattern. ## To enable access to raw_files put `FilesController:raw`. ## To enable access to patches add `ChangesetController:changeset_patch`. ## The list should be "," separated and on a single line. @@ -377,15 +379,15 @@ beaker.session.lock_dir = %(here)s/data/ ## Secure encrypted cookie. Requires AES and AES python libraries ## you must disable beaker.session.secret to use this -#beaker.session.encrypt_key = -#beaker.session.validate_key = +#beaker.session.encrypt_key = key_for_encryption +#beaker.session.validate_key = validation_key ## sets session as invalid(also logging out user) if it haven not been ## accessed for given amount of time in seconds beaker.session.timeout = 2592000 beaker.session.httponly = true -## Path to use for the cookie. -#beaker.session.cookie_path = / +## Path to use for the cookie. Set to prefix if you use prefix middleware +#beaker.session.cookie_path = /custom_prefix ## uncomment for https secure cookie beaker.session.secure = false @@ -403,8 +405,8 @@ beaker.session.auto = false ## Full text search indexer is available in rhodecode-tools under ## `rhodecode-tools index` command -# WHOOSH Backend, doesn't require additional services to run -# it works good with few dozen repos +## WHOOSH Backend, doesn't require additional services to run +## it works good with few dozen repos search.module = rhodecode.lib.index.whoosh search.location = %(here)s/data/index @@ -511,7 +513,7 @@ sqlalchemy.db1.url = sqlite:///%(here)s/ ## print the sql statements to output sqlalchemy.db1.echo = false -## recycle the connections after this ammount of seconds +## recycle the connections after this amount of seconds sqlalchemy.db1.pool_recycle = 3600 sqlalchemy.db1.convert_unicode = true @@ -533,18 +535,19 @@ vcs.server = localhost:9900 ## Web server connectivity protocol, responsible for web based VCS operatations ## Available protocols are: -## `pyro4` - using pyro4 server -## `http` - using http-rpc backend (default) +## `pyro4` - use pyro4 server +## `http` - use http-rpc backend (default) vcs.server.protocol = http ## Push/Pull operations protocol, available options are: -## `pyro4` - using pyro4 server -## `http` - using http-rpc backend (default) +## `pyro4` - use pyro4 server +## `http` - use http-rpc backend (default) +## vcs.scm_app_implementation = http ## Push/Pull operations hooks protocol, available options are: -## `pyro4` - using pyro4 server -## `http` - using http-rpc backend (default) +## `pyro4` - use pyro4 server +## `http` - use http-rpc backend (default) vcs.hooks.protocol = http vcs.server.log_level = debug @@ -573,8 +576,8 @@ svn.proxy.generate_config = false svn.proxy.list_parent_path = true ## Set location and file name of generated config file. svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf -## Used as a prefix to the block in the generated config file. In -## most cases it should be set to `/`. +## Used as a prefix to the `Location` block in the generated config file. +## In most cases it should be set to `/`. svn.proxy.location_root = / ## Command to reload the mod dav svn configuration on change. ## Example: `/etc/init.d/apache2 reload` diff --git a/configs/production.ini b/configs/production.ini --- a/configs/production.ini +++ b/configs/production.ini @@ -511,6 +511,7 @@ vcs.server.protocol = http ## Push/Pull operations protocol, available options are: ## `pyro4` - use pyro4 server ## `http` - use http-rpc backend (default) +## vcs.scm_app_implementation = http ## Push/Pull operations hooks protocol, available options are: @@ -544,7 +545,7 @@ svn.proxy.generate_config = false svn.proxy.list_parent_path = true ## Set location and file name of generated config file. svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf -## Used as a prefix to the block in the generated config file. +## Used as a prefix to the `Location` block in the generated config file. ## In most cases it should be set to `/`. svn.proxy.location_root = / ## Command to reload the mod dav svn configuration on change.