diff --git a/docs/admin/apache-reverse-proxy.rst b/docs/admin/apache-reverse-proxy.rst --- a/docs/admin/apache-reverse-proxy.rst +++ b/docs/admin/apache-reverse-proxy.rst @@ -9,24 +9,24 @@ Here is a sample configuration file for ServerName hg.myserver.com ServerAlias hg.myserver.com - ## uncomment root directive if you want to serve static files by nginx - ## requires static_files = false in .ini file - DocumentRoot /path/to/installation/rhodecode/public + ## uncomment root directive if you want to serve static files by + ## Apache requires static_files = false in .ini file + #DocumentRoot /path/to/rhodecode/installation/public Order allow,deny Allow from all - #important ! - #Directive to properly generate url (clone url) for pylons + ## Important ! + ## Directive to properly generate url (clone url) for pylons ProxyPreserveHost On - #rhodecode instance - ProxyPass / http://127.0.0.1:5000/ - ProxyPassReverse / http://127.0.0.1:5000/ + ## RhodeCode instance running + ProxyPass / http://127.0.0.1:10002/ + ProxyPassReverse / http://127.0.0.1:10002/ - #to enable https use line below + ## to enable https use line below #SetEnvIf X-Url-Scheme https HTTPS=1 diff --git a/docs/admin/nginx-config-example.rst b/docs/admin/nginx-config-example.rst --- a/docs/admin/nginx-config-example.rst +++ b/docs/admin/nginx-config-example.rst @@ -7,11 +7,11 @@ Use the following example to configure N upstream rc { - server 127.0.0.1:5000; + server 127.0.0.1:10002; # add more instances for load balancing - # server 127.0.0.1:5001; - # server 127.0.0.1:5002; + # server 127.0.0.1:10003; + # server 127.0.0.1:10004; } ## gist alias @@ -58,14 +58,15 @@ Use the following example to configure N ## uncomment root directive if you want to serve static files by nginx ## requires static_files = false in .ini file - # root /path/to/installation/rhodecode/public; + # root /path/to/rhodecode/installation/public; include /etc/nginx/proxy.conf; - location / { - try_files $uri @rhode; - } + + location / { + try_files $uri @rhode; + } location @rhode { - proxy_pass http://rc; - } + proxy_pass http://rc; + } }