diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2016-02-17 12:27:35 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2016-02-17 12:27:35 +0100 |
| commit | fdf115604c036ca05656380f91a29166b40ed1f0 (patch) | |
| tree | ea8a0dbcb4ffb2ed446953c5d263e0b741789236 /docs/en/rst/installing | |
| parent | dad451b506a02669c8220f668aadafddbd58cf40 (diff) | |
| download | bugzilla-fdf115604c036ca05656380f91a29166b40ed1f0.tar.gz bugzilla-fdf115604c036ca05656380f91a29166b40ed1f0.tar.xz | |
Bug 1242263: The web server and SQL server sections are not correctly referenced in the documentation
r=gerv
Diffstat (limited to 'docs/en/rst/installing')
| -rw-r--r-- | docs/en/rst/installing/apache-windows.rst | 4 | ||||
| -rw-r--r-- | docs/en/rst/installing/db_server.rst | 18 | ||||
| -rw-r--r-- | docs/en/rst/installing/index.rst | 2 | ||||
| -rw-r--r-- | docs/en/rst/installing/linux.rst | 1 | ||||
| -rw-r--r-- | docs/en/rst/installing/nginx.rst | 9 | ||||
| -rw-r--r-- | docs/en/rst/installing/web_server.rst | 14 |
6 files changed, 46 insertions, 2 deletions
diff --git a/docs/en/rst/installing/apache-windows.rst b/docs/en/rst/installing/apache-windows.rst index fca8ef5eb..c119e1b13 100644 --- a/docs/en/rst/installing/apache-windows.rst +++ b/docs/en/rst/installing/apache-windows.rst @@ -1,7 +1,7 @@ .. _apache-windows: -Apache -###### +Apache on Windows +################# Bugzilla supports all versions of Apache 2.2.x and 2.4.x. diff --git a/docs/en/rst/installing/db_server.rst b/docs/en/rst/installing/db_server.rst new file mode 100644 index 000000000..8a7d89633 --- /dev/null +++ b/docs/en/rst/installing/db_server.rst @@ -0,0 +1,18 @@ +.. _db_server: + +Database Server +############### + +Bugzilla requires a database to store its data. We recommend either MySQL or +PostgreSQL for production installations. Oracle 10 should work fine, but very +little or no testing has been done with Oracle 11 and 12. SQLite is easy to +configure but, due to its limitations, it should only be used for testing +purposes and very small installations. + +.. toctree:: + :maxdepth: 1 + + mysql + postgresql + oracle + sqlite diff --git a/docs/en/rst/installing/index.rst b/docs/en/rst/installing/index.rst index 91a81bede..06d027680 100644 --- a/docs/en/rst/installing/index.rst +++ b/docs/en/rst/installing/index.rst @@ -25,6 +25,8 @@ case, you may want to read the :ref:`Quick Start instructions <quick-start>`. linux windows mac-os-x + web_server + db_server essential-post-install-config optional-post-install-config migrating diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst index 084caeae3..a8a790dd7 100644 --- a/docs/en/rst/installing/linux.rst +++ b/docs/en/rst/installing/linux.rst @@ -180,6 +180,7 @@ Any web server that is capable of running CGI scripts can be made to work. We have specific configuration instructions for the following: * :ref:`apache` +* :ref:`nginx` .. _linux-config-database: diff --git a/docs/en/rst/installing/nginx.rst b/docs/en/rst/installing/nginx.rst new file mode 100644 index 000000000..9f78d1305 --- /dev/null +++ b/docs/en/rst/installing/nginx.rst @@ -0,0 +1,9 @@ +.. _nginx: + +Nginx +##### + +Nginx can run Bugzilla as a PSGI application using Plack. + +.. todo:: Give an example of how to configure Nginx and Plack. + Work tracked in `bug 645282 <https://bugzilla.mozilla.org/show_bug.cgi?id=645282>`_. diff --git a/docs/en/rst/installing/web_server.rst b/docs/en/rst/installing/web_server.rst new file mode 100644 index 000000000..3dfeb6a13 --- /dev/null +++ b/docs/en/rst/installing/web_server.rst @@ -0,0 +1,14 @@ +.. _web_server: + +Web Server +########## + +Bugzilla requires a web server. It supports the following: + +.. toctree:: + :maxdepth: 1 + + apache + apache-windows + iis + nginx |