# HG changeset patch # User lisaq # Date 2016-07-20 09:22:33 # Node ID 007d07e1e0c4f24e1f25c4f0e286a480136a3f9f # Parent 3a00c4dcb8b22fe8bfcc0b1fcc4365dcc59e7de5 docs: updating vcsserver commands and development.ini defaults diff --git a/configs/development.ini b/configs/development.ini --- a/configs/development.ini +++ b/configs/development.ini @@ -498,18 +498,18 @@ vcs.server = localhost:9900 ## Available protocols are: ## `pyro4` - using pyro4 server ## `http` - using http-rpc backend -#vcs.server.protocol = http +vcs.server.protocol = http ## Push/Pull operations protocol, available options are: ## `pyro4` - using pyro4 server ## `rhodecode.lib.middleware.utils.scm_app_http` - Http based, recommended ## `vcsserver.scm_app` - internal app (EE only) -#vcs.scm_app_implementation = rhodecode.lib.middleware.utils.scm_app_http +vcs.scm_app_implementation = rhodecode.lib.middleware.utils.scm_app_http ## Push/Pull operations hooks protocol, available options are: ## `pyro4` - using pyro4 server ## `http` - using http-rpc backend -#vcs.hooks.protocol = http +vcs.hooks.protocol = http vcs.server.log_level = debug ## Start VCSServer with this instance as a subprocess, usefull for development diff --git a/docs/contributing/dev-setup.rst b/docs/contributing/dev-setup.rst --- a/docs/contributing/dev-setup.rst +++ b/docs/contributing/dev-setup.rst @@ -91,9 +91,9 @@ use the following steps: 1. Create a copy of `~/rhodecode-enterprise-ce/configs/development.ini` 2. Adjust the configuration settings to your needs - .. note:: +.. note:: - It is recommended to use the name `dev.ini`. + It is recommended to use the name `dev.ini`. Setup the Development Database @@ -124,17 +124,6 @@ files. Start the Development Server ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -First, set the `start.vcs_server` flag in the ``dev.ini`` file to true. -For example: - - .. code-block:: python - - ### VCS CONFIG ### - ################## - vcs.start_server = true - vcs.server = localhost:9900 - vcs.server.log_level = debug - From the rhodecode-vcsserver directory, start the development server in another nix-shell, using the following command:: @@ -143,10 +132,13 @@ nix-shell, using the following command:: In the adjacent nix-shell which you created for your development server, you may now start CE with the following command:: + rcserver dev.ini -You may also wish to use the option `--reload` with this command so that any -changes which you make in the code trigger an automatic refresh. +.. note:: + + To automatically refresh - and recompile the frontend assets - when changes + are made in the source code, you can use the option `--reload`. Run the Environment Tests