Move Directory out of VirtualHost (5.2) (#120)

* Move Directory out of VirtualHost

* Unindent the block

* Remove VirtualHost block and refer to Apache section

* Switch over to using webapps directory

diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst
index 481bc50483c86aabc6d8b45e502db26f67bb3a9b..f6e122481c9aa0bcb1e9d46ce4f8c17993bfaf06 100644 (file)
--- a/docs/en/rst/installing/quick-start.rst
+++ b/docs/en/rst/installing/quick-start.rst
@@ -107,17 +107,16 @@ Configure Apache
 Paste in the following and save:
 
 .. code-block:: apache
+ Alias /bugzilla /var/www/webapps/bugzilla
+ <Directory /var/www/webapps/bugzilla>
+   AddHandler cgi-script .cgi
+   Options +ExecCGI
+   DirectoryIndex index.cgi index.html
+   AllowOverride All
+ </Directory>
 
- <VirtualHost \*:80>
-   ServerName localhost
-
-   <Directory /var/www/html/bugzilla>
-     AddHandler cgi-script .cgi
-     Options +ExecCGI
-     DirectoryIndex index.cgi index.html
-     AllowOverride All
-   </Directory>
- </VirtualHost>
+This configuration sets up Bugzilla to be served on your server under ``/bugzilla`` path.
+For more in depth setup instructions, refer to :ref:`Apache section of this documentation <apache>`.
 
 :command:`a2ensite bugzilla`
 
@@ -130,7 +129,9 @@ Download Bugzilla
 
 Get it from our Git repository:
 
-:command:`cd /var/www/html`
+:command:`mkdir -p /var/www/webapps`
+
+:command:`cd /var/www/webapps`
 
 :command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla bugzilla`
 
@@ -146,7 +147,7 @@ generates a config file (called :file:`localconfig`) for the database
 access information, and the second time (step 10)
 it uses the info you put in the config file to set up the database.
 
-:command:`cd /var/www/html/bugzilla`
+:command:`cd /var/www/webapps/bugzilla`
 
 :command:`./checksetup.pl`