Merge branch '1.3.x'

doc/getting_started/configuration.rst

@@ -343,7 +343,7 @@ whose ``expire_date`` is in the past.
 
 For example, you could setup a cron job to run this script every night::
 
-  0 0 * * * <modoboa_site>/manage.py cleanup
+  0 0 * * * <modoboa_site>/manage.py clearsessions
   #
   # Or like this if you use a virtual environment:
   # 0 0 * * * <virtualenv path/bin/python> <modoboa_site>/manage.py clearsessions

doc/getting_started/install.rst

@@ -103,6 +103,11 @@ Deployment
    If you want to use install all extensions, just use the ``all``
    shortcut like this ``--extensions all``.
 
+   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.
+
 .. note::
 
    You can specify more than one database connection using the

doc/getting_started/upgrade.rst

@@ -49,6 +49,27 @@ you did choose. See :ref:`webservers` for more details.
 Specific upgrade instructions
 *****************************
 
+1.3.2
+=====
+
+Modoboa now uses the *atomic requests* mode to preserve database
+consistency (`reference
+<https://docs.djangoproject.com/en/1.7/topics/db/transactions/#tying-transactions-to-http-requests>`_).
+
+To enable it, update the ``DATABASES`` variable in ``settings.py`` as
+follows::
+
+  DATABASES = {
+      "default": {
+          # stuff before...
+          "ATOMIC_REQUESTS": True
+      },
+      "amavis": {
+          # stuff before...
+          "ATOMIC_REQUESTS": True
+      }
+  }
+
 1.3.0
 =====
 
@@ -112,6 +133,11 @@ Here are the required steps:
    $ python manage.py load_initial_data
    $ python manage.py collectstatic
 
+#. The cleanup job has been renamed in Django, so you have to modify your crontab entry::
+
+   - 0 0 * * * <modoboa_site>/manage.py cleanup
+   + 0 0 * * * <modoboa_site>/manage.py clearsessions
+
 1.2.0
 =====
 

modoboa/core/commands/deploy.py

@@ -31,6 +31,7 @@ DBCONN_TPL = """
         'PASSWORD': '{% if PASSWORD %}{{ PASSWORD }}{% endif %}',
         'HOST': '{% if HOST %}{{ HOST }}{% endif %}',
         'PORT': '{% if PORT %}{{ PORT }}{% endif %}',
+        'ATOMIC_REQUESTS': True,
         {% if ENGINE == 'django.db.backends.mysql' %}'OPTIONS' : {
             "init_command" : 'SET foreign_key_checks = 0;',
         },{% endif %}