merge

docs/setup.rst

@@ -178,7 +178,7 Sample config for nginx using proxy::
             if (!-f $request_filename){
                 proxy_pass      http://127.0.0.1:5000;
             }
-            #this is important for https !!!
+            #this is important if You want to use https !!!
             proxy_set_header X-Url-Scheme $scheme;
             include         /etc/nginx/proxy.conf;  
     }
@@ -216,9 +216,36 in production.ini file::
 
 To not have the statics served by the application. And improve speed.
 
-Apache reverse proxy
---------------------
-Tutorial can be found here
+
+Apache virtual host example
+---------------------------
+
+Sample config for apache using proxy::
+
+<VirtualHost *:80>
+        ServerName hg.myserver.com
+        ServerAlias hg.myserver.com
+
+        <Proxy *>
+          Order allow,deny
+          Allow from all
+        </Proxy>
+
+        #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/
+        
+        #to enable https use line below
+        #SetEnvIf X-Url-Scheme https HTTPS=1
+        
+</VirtualHost> 
+
+
+Additional tutorial
 http://wiki.pylonshq.com/display/pylonscookbook/Apache+as+a+reverse+proxy+for+Pylons
 
 
@@ -230,11 +257,10 TODO !
 Other configuration files
 -------------------------
 
-Some extra configuration files and examples can be found here:
-http://hg.python-works.com/rhodecode/files/tip/init.d
+Some example init.d script can be found here, for debian and gentoo:
 
-and also an celeryconfig file can be use from here:
-http://hg.python-works.com/rhodecode/files/tip/celeryconfig.py
+https://rhodeocode.org/rhodecode/files/tip/init.d
+
 
 Troubleshooting
 ---------------