diff --git a/docs/admin/lab-settings.rst b/docs/admin/lab-settings.rst --- a/docs/admin/lab-settings.rst +++ b/docs/admin/lab-settings.rst @@ -8,7 +8,7 @@ level of support to optimize for product use the following instructions: 1. Open the |RCE| configuration file, - :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` + :file:`config/_shared/rhodecode.ini` 2. Add the following configuration option in the ``[app:main]`` section. diff --git a/docs/admin/sec-x-frame.rst b/docs/admin/sec-x-frame.rst --- a/docs/admin/sec-x-frame.rst +++ b/docs/admin/sec-x-frame.rst @@ -42,7 +42,7 @@ information see the :ref:`apache-ws-ref` |RCE| can also be configured to force strict *https* connections and Strict Transport Security. To set this, configure the following options to ``true`` -in the :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. +in the :file:`config/_shared/rhodecode.ini` file. .. code-block:: ini diff --git a/docs/admin/sec-your-server.rst b/docs/admin/sec-your-server.rst --- a/docs/admin/sec-your-server.rst +++ b/docs/admin/sec-your-server.rst @@ -83,7 +83,7 @@ see the `OpenSSL PKI tutorial`_ site, or If the network you are running is SSL/TLS encrypted, you can configure |RCE| to always use secure connections using the ``force_https`` and ``use_htsts`` -options in the :file:`/home/user/.rccontrol/instance-id/rhodecode.ini` file. +options in the :file:`config/_shared/rhodecode.ini` file. For more details, see the :ref:`x-frame` section. FireWalls and Ports diff --git a/docs/admin/system-overview.rst b/docs/admin/system-overview.rst --- a/docs/admin/system-overview.rst +++ b/docs/admin/system-overview.rst @@ -78,7 +78,7 @@ For example: Configuration Files ------------------- -* :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` +* :file:`config/_shared/rhodecode.ini` * :file:`/home/{user}/.rccontrol/{instance-id}/search_mapping.ini` * :file:`/home/{user}/.rccontrol/{vcsserver-id}/vcsserver.ini` * :file:`/home/{user}/.rccontrol/supervisor/supervisord.ini` diff --git a/docs/admin/system_admin/admin-tricks.rst b/docs/admin/system_admin/admin-tricks.rst --- a/docs/admin/system_admin/admin-tricks.rst +++ b/docs/admin/system_admin/admin-tricks.rst @@ -188,7 +188,7 @@ Changing Default Language ^^^^^^^^^^^^^^^^^^^^^^^^^ To change the default language of a |RCE| instance, change the language code -in the :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. To +in the :file:`config/_shared/rhodecode.ini` file. To do this, use the following steps. 1. Open the :file:`rhodecode.ini` file and set the required language code. diff --git a/docs/admin/system_admin/config-files-overview.rst b/docs/admin/system_admin/config-files-overview.rst --- a/docs/admin/system_admin/config-files-overview.rst +++ b/docs/admin/system_admin/config-files-overview.rst @@ -11,7 +11,7 @@ sections. \- **rhodecode.ini** Default location: - :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` + :file:`config/_shared/rhodecode.ini` This is the main |RCE| configuration file and controls much of its default behaviour. It is also used to configure certain customer diff --git a/docs/admin/system_admin/enable-debug.rst b/docs/admin/system_admin/enable-debug.rst --- a/docs/admin/system_admin/enable-debug.rst +++ b/docs/admin/system_admin/enable-debug.rst @@ -14,7 +14,7 @@ track particular user logs only, and exc simply grep by `req_id` uuid which you'll have to find for the individual request. To enable debug mode on a |RCE| instance you need to set the debug property -in the :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. To +in the :file:`config/_shared/rhodecode.ini` file. To do this, use the following steps 1. Open the file and set the ``debug`` line to ``true`` @@ -38,7 +38,7 @@ Debug and Logging Configuration ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Further debugging and logging settings can also be set in the -:file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. +:file:`config/_shared/rhodecode.ini` file. In the logging section, the various packages that run with |RCE| can have different debug levels set. If you want to increase the logging level change diff --git a/docs/admin/system_admin/svn-http.rst b/docs/admin/system_admin/svn-http.rst --- a/docs/admin/system_admin/svn-http.rst +++ b/docs/admin/system_admin/svn-http.rst @@ -134,7 +134,7 @@ 2. Go to the :menuselection:`Admin --> S :guilabel:`Subversion HTTP Server URL`. 3. Open the |RCE| configuration file, - :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` + :file:`config/_shared/rhodecode.ini` 4. Add the following configuration option in the ``[app:main]`` section if you don't have it yet. diff --git a/docs/admin/system_admin/tuning/tuning-change-encoding.rst b/docs/admin/system_admin/tuning/tuning-change-encoding.rst --- a/docs/admin/system_admin/tuning/tuning-change-encoding.rst +++ b/docs/admin/system_admin/tuning/tuning-change-encoding.rst @@ -4,7 +4,7 @@ Change Default Encoding ----------------------- |RCE| uses ``utf8`` encoding by default. You can change the default encoding -in the :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. To +in the :file:`config/_shared/rhodecode.ini` file. To change the default encoding used by |RCE|, set a new value for the ``default_encoding``. diff --git a/docs/admin/system_admin/tuning/tuning-hg-auth-loop.rst b/docs/admin/system_admin/tuning/tuning-hg-auth-loop.rst --- a/docs/admin/system_admin/tuning/tuning-hg-auth-loop.rst +++ b/docs/admin/system_admin/tuning/tuning-hg-auth-loop.rst @@ -7,7 +7,7 @@ When using external authentication tools password retry loop in |hg| can result in users being locked out due to too many failed password attempts. To prevent this from happening, add the following setting to your -:file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file, in the +:file:`config/_shared/rhodecode.ini` file, in the ``[app:main]`` section. diff --git a/docs/admin/system_admin/tuning/tuning-scale-horizontally-cluster.rst b/docs/admin/system_admin/tuning/tuning-scale-horizontally-cluster.rst --- a/docs/admin/system_admin/tuning/tuning-scale-horizontally-cluster.rst +++ b/docs/admin/system_admin/tuning/tuning-scale-horizontally-cluster.rst @@ -100,7 +100,7 @@ Each one should already connect to share 1) Assuming our final url will be http://rc-node-1, Configure `instances_id`, `app.base_url` -a) On **rc-node-2** find the following settings and edit :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` +a) On **rc-node-2** find the following settings and edit :file:`config/_shared/rhodecode.ini` .. code-block:: ini @@ -109,7 +109,7 @@ a) On **rc-node-2** find the following s app.base_url = http://rc-node-1 -b) On **rc-node-3** find the following settings and edit :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` +b) On **rc-node-3** find the following settings and edit :file:`config/_shared/rhodecode.ini` .. code-block:: ini @@ -121,7 +121,7 @@ b) On **rc-node-3** find the following s 2) Configure `User Session` to use a shared database. Example config that should be changed on both **rc-node-2** and **rc-node-3** . - Edit :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` + Edit :file:`config/_shared/rhodecode.ini` .. code-block:: ini @@ -163,7 +163,7 @@ 3) Configure stored cached/archive cache 4) Use shared exception store. Example config that should be changed on both **rc-node-2** and **rc-node-3**, and also for VCSServer. - Edit :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` and + Edit :file:`config/_shared/rhodecode.ini` and :file:`/home/{user}/.rccontrol/{vcsserver-instance-id}/vcsserver.ini` and add/change following setting. diff --git a/docs/admin/system_admin/tuning/tuning-user-sessions-performance.rst b/docs/admin/system_admin/tuning/tuning-user-sessions-performance.rst --- a/docs/admin/system_admin/tuning/tuning-user-sessions-performance.rst +++ b/docs/admin/system_admin/tuning/tuning-user-sessions-performance.rst @@ -15,7 +15,7 @@ scalability, and maintainability we reco sessions to database-based user sessions or Redis based sessions. To switch to database-based user sessions uncomment the following section in -your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. +your :file:`config/_shared/rhodecode.ini` file. .. code-block:: ini @@ -49,7 +49,7 @@ uses, or if required it can be a differe To switch to redis-based user sessions uncomment the following section in -your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. +your :file:`config/_shared/rhodecode.ini` file. .. code-block:: ini diff --git a/docs/admin/system_admin/vcs-server.rst b/docs/admin/system_admin/vcs-server.rst --- a/docs/admin/system_admin/vcs-server.rst +++ b/docs/admin/system_admin/vcs-server.rst @@ -52,7 +52,7 @@ To configure a |RCE| instance to use a V The following list shows the available options on the |RCE| side of the connection to the VCS Server. The settings are configured per instance in the -:file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. +:file:`config/_shared/rhodecode.ini` file. .. rst-class:: dl-horizontal diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -27,7 +27,7 @@ of views that have API access enabled by edit the |RCE| configuration ``.ini`` file. The default location is: * |RCE| Pre-2.2.7 :file:`root/rhodecode/data/production.ini` -* |RCE| 3.0 :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` +* |RCE| 3.0 :file:`config/_shared/rhodecode.ini` To configure the white list, edit this section of the file. In this configuration example, API access is granted to the patch/diff raw file and diff --git a/docs/auth/ssh-connection.rst b/docs/auth/ssh-connection.rst --- a/docs/auth/ssh-connection.rst +++ b/docs/auth/ssh-connection.rst @@ -87,7 +87,7 @@ 3. Set base_url for instance to enable p Hostname is required for the integration to properly set the instance URL. When your hostname is known (e.g https://code.rhodecode.com) please set it - inside :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` + inside :file:`config/_shared/rhodecode.ini` add into `[app:main]` section the following configuration: @@ -111,7 +111,7 @@ 4. Add the public key to your user accou In case of connection problems please set `ssh.enable_debug_logging = true` inside the SSH configuration of - :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` + :file:`config/_shared/rhodecode.ini` Then add, remove your SSH key and try connecting again. Debug logging will be printed to help find the problems on the server side. diff --git a/docs/install/setup-email.rst b/docs/install/setup-email.rst --- a/docs/install/setup-email.rst +++ b/docs/install/setup-email.rst @@ -4,7 +4,7 @@ Set up Email ------------ To setup email with your |RCE| instance, open the default -:file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` +:file:`config/_shared/rhodecode.ini` file and uncomment and configure the email section. If it is not there, use the below example to insert it. diff --git a/docs/tutorials/multi-instance-setup.rst b/docs/tutorials/multi-instance-setup.rst --- a/docs/tutorials/multi-instance-setup.rst +++ b/docs/tutorials/multi-instance-setup.rst @@ -27,7 +27,7 @@ 1. Install a new instance of |RCE|, choo Once the new instance is installed you need to update the licence token and database connection string in the - :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. + :file:`config/_shared/rhodecode.ini` file. .. code-block:: bash