diff options
Diffstat (limited to 'doc/setup/deploy.rst')
| -rw-r--r-- | doc/setup/deploy.rst | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst index 0d7303a795a..b0a5cf3224e 100644 --- a/doc/setup/deploy.rst +++ b/doc/setup/deploy.rst @@ -44,7 +44,7 @@ correctly. Configuration samples --------------------- -* show only databases with names beginning with 'mycompany' +* Show only databases with names beginning with 'mycompany' in ``/etc/odoo.conf`` set: @@ -87,18 +87,18 @@ machine, and is the default when no host is provided, but if you want Odoo and PostgreSQL to execute on different machines [#different-machines]_ it will need to `listen to network interfaces`_ [#remote-socket]_, either: -* only accept loopback connections and `use an SSH tunnel`_ between the +* Only accept loopback connections and `use an SSH tunnel`_ between the machine on which Odoo runs and the one on which PostgreSQL runs, then configure Odoo to connect to its end of the tunnel -* accept connections to the machine on which Odoo is installed, possibly +* Accept connections to the machine on which Odoo is installed, possibly over ssl (see `PostgreSQL connection settings`_ for details), then configure Odoo to connect over the network Configuration sample -------------------- -* allow tcp connection on localhost -* allow tcp connection from 192.168.1.x network +* Allow tcp connection on localhost +* Allow tcp connection from 192.168.1.x network in ``/etc/postgresql/9.5/main/pg_hba.conf`` set: @@ -134,11 +134,11 @@ create a new user (``odoo``) and set it as the database user. simply checked before performing database alterations. It should be set to a randomly generated value to ensure third parties can not use this interface. -* all database operations use the :ref:`database options +* All database operations use the :ref:`database options <reference/cmdline/server/database>`, including the database management screen. For the database management screen to work requires that the PostgreSQL user have ``createdb`` right. -* users can always drop databases they own. For the database management screen +* Users can always drop databases they own. For the database management screen to be completely non-functional, the PostgreSQL user needs to be created with ``no-createdb`` and the database must be owned by a different PostgreSQL user. @@ -248,10 +248,10 @@ authentication information in cleartext. This means a secure deployment of Odoo must use HTTPS\ [#switching]_. SSL termination can be implemented via just about any SSL termination proxy, but requires the following setup: -* enable Odoo's :option:`proxy mode <odoo-bin --proxy-mode>`. This should only be enabled when Odoo is behind a reverse proxy -* set up the SSL termination proxy (`Nginx termination example`_) -* set up the proxying itself (`Nginx proxying example`_) -* your SSL termination proxy should also automatically redirect non-secure +* Enable Odoo's :option:`proxy mode <odoo-bin --proxy-mode>`. This should only be enabled when Odoo is behind a reverse proxy +* Set up the SSL termination proxy (`Nginx termination example`_) +* Set up the proxying itself (`Nginx proxying example`_) +* Your SSL termination proxy should also automatically redirect non-secure connections to the secure port .. warning:: @@ -263,8 +263,8 @@ just about any SSL termination proxy, but requires the following setup: Configuration sample -------------------- -* redirect http requests to https -* proxy requests to odoo +* Redirect http requests to https +* Proxy requests to odoo in ``/etc/odoo.conf`` set: @@ -349,10 +349,10 @@ Cron Workers To run cron jobs for an Odoo deployment as a WSGI application requires -* a classical Odoo (run via ``odoo-bin``) -* connected to the database in which cron jobs have to be run (via +* A classical Odoo (run via ``odoo-bin``) +* Connected to the database in which cron jobs have to be run (via :option:`odoo-bin -d`) -* which should not be exposed to the network. To ensure cron runners are not +* Which should not be exposed to the network. To ensure cron runners are not network-accessible, it is possible to disable the built-in HTTP server entirely with :option:`odoo-bin --no-http` or setting ``http_enable = False`` in the configuration file @@ -372,11 +372,11 @@ notifications. The solutions to support livechat/motifications in a WSGI application are: -* deploy a threaded version of Odoo (instread of a process-based preforking +* Deploy a threaded version of Odoo (instread of a process-based preforking one) and redirect only requests to URLs starting with ``/longpolling/`` to that Odoo, this is the simplest and the longpolling URL can double up as the cron instance. -* deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting +* Deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting with ``/longpolling/`` to :option:`the longpolling port <odoo-bin --longpolling-port>`. |