[DOC] updated gunicorn doc, a.k.a. why we can't have nice things.

bzr revid: vmt@openerp.com-20130122112658-wu8ffx6h5c4otv1r

2 files changed, 12 insertions, 41 deletions

diff --git a/doc/09_deployment.rst b/doc/deployment-gunicorn.rst
index 70f5114638a..fa4022c53ef 100644
--- a/doc/09_deployment.rst
+++ b/doc/deployment-gunicorn.rst
@@ -16,20 +16,20 @@ Summary
 
 Configuring and starting an OpenERP server with Gunicorn is straightfoward. The
 different sections below give more details but the following steps are all it
-takes::
+takes:
 
- 1. Use a configuration file, passing it to ``gunicorn`` using the ``-c``
-    option.
- 2. Within the same configuration file, also configure OpenERP.
- 3. Run ``gunicorn openerp:wsgi.core.application -c gunicorn.conf.py``.
+1. Use a configuration file, passing it to ``gunicorn`` using the ``-c``
+   option.
+2. Within the same configuration file, also configure OpenERP.
+3. Run ``gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py``.
 
 Sample configuration file
 -------------------------
 
-A sample ``gunicorn.conf.py`` configuration file for Gunicorn can be found in
-the OpenERP server source tree. It is fairly well commented and easily
+A sample ``openerp-wsgi.py`` configuration file for WSGI servers can be found
+in the OpenERP server source tree. It is fairly well commented and easily
 customizable for your own usage. While reading the remaining of this page, it
-is advised you take a look at the sample ``gunicorn.conf.py`` file as it makes
+is advised you take a look at the sample ``openerp-wsgi.py`` file as it makes
 things easier to follow.
 
 Configuration
@@ -37,7 +37,7 @@ Configuration
 
 Gunicorn can be configured by a configuration file and/or command-line
 arguments. For a list of available options, you can refer to the official
-Gunicorn documentation http://gunicorn.org/configure.html.
+Gunicorn documentation http://docs.gunicorn.org/en/latest/configure.html.
 
 When the OpenERP server is started on its own, by using the ``openerp-server``
 script, it can also be configured by a configuration file or its command-line
@@ -46,7 +46,7 @@ as the Gunicorn configuration file is a full-fledged Python file, we can
 ``import openerp`` in it and configure directly the server.
 
 The principle can be summarized with this three lines (although they are spread
-across the whole sample ``gunicorn.conf.py`` file)::
+across the whole sample ``openerp-wsgi.py`` file)::
 
   import openerp
   conf = openerp.tools.config
@@ -57,45 +57,16 @@ containing the OpenERP server implementation). The second one is really to
 shorten repeated usage of the same variable. The third one sets a parameter, in
 this case the equivalent of the ``--addons-path`` command-line option.
 
-Finally, Gunicorn offers a few hooks so we can call our own code at some points
-in its execution. The most important one is the ``on_starting`` hook. It lets
-us properly initialize the ``openerp`` library before Gunicorn starts handling
-requests. ``pre_request`` and ``post_request`` are called before and after
-requests are handled. We provide functions in ``openerp.wsgi.core`` that can be
-used to define those hooks: a typical Gunicorn configuration for OpenERP will
-thus contains::
-
-  on_starting = openerp.wsgi.core.on_starting
-  pre_request = openerp.wsgi.core.pre_request
-  post_request = openerp.wsgi.core.post_request
-
 Running
 -------
 
 Once a proper configuration file is available, running the OpenERP server with
 Gunicorn can be done with the following command::
 
-  > gunicorn openerp:wsgi.core.application -c gunicorn.conf.py
+  > gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
 
 ``openerp`` must be importable by Python. The simplest way is to run the above
 command from the server source directory (i.e. the directory containing the
 ``openerp`` module). Alternatively, the module can be installed on your machine
 as a regular Python library or added to your ``PYTHONPATH``.
 
-Running behind a reverse proxy
-------------------------------
-
-If you intend to run Gunicorn behind a reverse proxy (nginx_ is recommended),
-an alternative entry point is available in ``openerp.wsgi.proxied``. That entry
-point uses werkzeug's ProxyFix_ class to set a few headers. You first have to
-explicitely import that sub-module if you want to use it. So add this line in
-the configuration file::
-
-  import openerp.wsgi.proxied
-
-and then adapt the command-line::
-
-  > gunicorn openerp:wsgi.proxied.application -c gunicorn.conf.py
-
-.. _nginx: http://nginx.org/en/
-.. _ProxyFix: http://werkzeug.pocoo.org/docs/contrib/fixers/#werkzeug.contrib.fixers.ProxyFix
diff --git a/doc/index.rst b/doc/index.rst
index 37870af49a8..33474e2da57 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -16,7 +16,7 @@ OpenERP Server
    04_security
    05_test_framework
    06_misc
-   09_deployment
+   deployment-gunicorn
 
 OpenERP Command
 '''''''''''''''