diff --git a/configs/development.ini b/configs/development.ini --- a/configs/development.ini +++ b/configs/development.ini @@ -91,7 +91,7 @@ asyncore_use_poll = true #timeout = 21600 -## prefix middleware for RhodeCode, disables force_https flag. +## 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. diff --git a/configs/production.ini b/configs/production.ini --- a/configs/production.ini +++ b/configs/production.ini @@ -91,7 +91,7 @@ max_requests_jitter = 30 timeout = 21600 -## prefix middleware for RhodeCode, disables force_https flag. +## prefix middleware for RhodeCode. ## recommended when using proxy setup. ## allows to set RhodeCode under a prefix in server. ## eg https://server.com/custom_prefix. Enable `filter-with =` option below as well. diff --git a/docs/admin/apache-subdirectory.rst b/docs/admin/apache-subdirectory.rst --- a/docs/admin/apache-subdirectory.rst +++ b/docs/admin/apache-subdirectory.rst @@ -7,10 +7,11 @@ Use the following example to configure A .. code-block:: apache - > # Change into your chosen prefix - ProxyPass http://127.0.0.1:5000/ - ProxyPassReverse http://127.0.0.1:5000/ - SetEnvIf X-Url-Scheme https HTTPS=1 + / # Change into your chosen prefix + ProxyPreserveHost On + ProxyPass "http://127.0.0.1:5000/" + ProxyPassReverse "http://127.0.0.1:5000/" + Header set X-Url-Scheme https env=HTTPS In addition to the regular Apache setup you will need to add the following diff --git a/rhodecode/tests/rhodecode.ini b/rhodecode/tests/rhodecode.ini --- a/rhodecode/tests/rhodecode.ini +++ b/rhodecode/tests/rhodecode.ini @@ -150,7 +150,7 @@ asyncore_use_poll = true ## how many workers should be spawned at a time #cheaper-step = 1 -## prefix middleware for RhodeCode, disables force_https flag. +## 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.