diff --git a/12.0.Dockerfile b/12.0.Dockerfile index 9663c306112c6823094377ec59a18fc7f78cc8fe..d3d509d12621ae095ae1693eac474d91e283e259 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -72,7 +72,9 @@ RUN set -x; \ /tmp/oca-repos/partner-contact/partner_disable_gravatar \ /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-auth.git /tmp/oca-repos/server-auth &&\ - mv /tmp/oca-repos/server-auth/password_security /opt/odoo/additional_addons/ &&\ + mv /tmp/oca-repos/server-auth/auth_session_timeout \ + /tmp/oca-repos/server-auth/password_security \ + /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-brand.git /tmp/oca-repos/server-brand &&\ mv /tmp/oca-repos/server-brand/disable_odoo_online /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\ diff --git a/README.md b/README.md index 9a622ff6bf77be32df0a14f425e146cccdb765a7..5f22333b9988430b6ea75de3f7042157f600a230 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,14 @@ The following OCA addons are included (in v10.0, and only the ones followed by * modules: - partner_firstname * - partner_disable_gravatar * - - repo: server-auth (only in v12) + - repo: server-auth (only in v12, modules were in server-tools in v10) modules: + - auth_session_timeout - password_security - repo: server-tools modules: - date_range (moved to server-ux in v12) - - auth_session_timeout + - auth_session_timeout (moved to server-auth in v12) - auth_brute_force - password_security (moved to server-auth in v12) - repo: server-brand (only in v12)