diff --git a/doc/manual_installation/dovecot.rst b/doc/manual_installation/dovecot.rst index 7c7a1eb1c..f0e5a8227 100644 --- a/doc/manual_installation/dovecot.rst +++ b/doc/manual_installation/dovecot.rst @@ -34,7 +34,7 @@ Then, edit the ``inbox`` namespace and add the following line:: inbox = yes -In order for dovecot to automaticaly create ususal folder on account creation, edit the ``inbox`` namespace of :file:`15-mailboxes.conf`:: +In order for dovecot to automaticaly create usual folders on account creation, edit the ``inbox`` namespace of :file:`15-mailboxes.conf`:: mailbox Drafts { auto = subscribe diff --git a/doc/manual_installation/modoboa.rst b/doc/manual_installation/modoboa.rst index 239196fef..66b1df231 100644 --- a/doc/manual_installation/modoboa.rst +++ b/doc/manual_installation/modoboa.rst @@ -106,12 +106,10 @@ Install the corresponding Python binding: (env)$ pip install psycopg[binary]>=3.1 .. note:: - - Alternatively, you can install the ``python3-psycopg2`` package instead on - Debian-based distributions if your virtual environment was created with - ``--system-site-packages`` option. - Note that psycopg 3.1 is required starting with modoboa 2.2.0 and - ubuntu and debian packages are too old for now. + Ubuntu and Debian repositories contain python-psycopgX package + but starting modoboa 2.2.0 minimum version required is 3.1 and + it has not yet it these distro yet + Prior modoboa version can run with ``python3-psycopg2``. Then, create a user and a database. For example, to create the ``modoboa`` database owned by a ``modoboa`` user, run the following commands on your @@ -175,8 +173,8 @@ you just have to run the following command: If you choose to install extensions one at a time, you will have to add their names in settings.py to ``MODOBOA_APPS``. Also ensure that you have the line ``from modoboa_amavis.settings import *`` at the - end of this file and possibly perform more steps. Check the manuall - of each extensions for specific Instructions. + end of this file and possibly perform more steps. Check the + documentation/readme of each extensions for specific Instructions. The list of available extensions can be found on the :doc:`index page <../index>`. Instructions to install them are available on diff --git a/doc/manual_installation/webserver.rst b/doc/manual_installation/webserver.rst index c885964fb..7badb4f2c 100644 --- a/doc/manual_installation/webserver.rst +++ b/doc/manual_installation/webserver.rst @@ -117,6 +117,7 @@ Recommend packages for debian and derivatives:: apt install uwsgi uwsgi-plugin-python3 Here is a sample nginx configuration:: + upstream modoboa { server unix: fail_timeout=0; } @@ -208,7 +209,7 @@ not be completely self-explanatory: media directories are because otherwise nginx won't be able to find them. - If Modoboa is at the root of your domain, then ```` + If Modoboa is at the root of your domain, then ```` is an empty string and can be deleted from the configuration above. In this case, you probably do not need the ``alias`` directives.