diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index 21539eb..7a84489 100644 --- a/roles/matrix_synapse/defaults/main.yml +++ b/roles/matrix_synapse/defaults/main.yml @@ -1,7 +1,7 @@ --- # Synapse version to deploy -synapse_version: '1.91.1' +synapse_version: '1.91.2' # Should ansible handle Synapse upgrades ? If false, only initial install will be done synapse_manage_upgrade: True diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml index 7e05b25..f227eca 100644 --- a/roles/metabase/defaults/main.yml +++ b/roles/metabase/defaults/main.yml @@ -1,15 +1,15 @@ --- # Version to deploy -metabase_version: 0.47.0 +metabase_version: 0.47.1 # URL to fetch the jar metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}/metabase.jar # Expected sha256 of the jar -metabase_jar_sha256: 9bf03a464163971196bec306590041e8f571f24e1d5a34695363f0dea1eba809 +metabase_jar_sha256: d86199ca8cac909198b16bffdf62e448bd17dc234e62c7540f66e654304b8327 # When building from source metabase_archive_url: https://github.com/metabase/metabase/archive/refs/tags/v{{ metabase_version }}.tar.gz # Expected sha256 of the archive -metabase_archive_sha256: e8adee62a8fc086ab45475284cdf006605aa03040d7ba902b98e1c47f6c6f520 +metabase_archive_sha256: b058cda14369207bc13f0c47d39746fe354043033d068f0a57f96ff559c574fb # Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled metabase_manage_upgrade: True diff --git a/roles/odoo/defaults/main.yml b/roles/odoo/defaults/main.yml index bd27b9e..4b23452 100644 --- a/roles/odoo/defaults/main.yml +++ b/roles/odoo/defaults/main.yml @@ -16,6 +16,10 @@ odoo_user: odoo # - Make odoo a SUPERUSER on the postgres server (so it should use a dedicated postgres server) odoo_db_manager: False +# When the DB manager is enabled, you can set a master password (used to manage databases). If not defined +# a random one will be created +# odoo_db_manager_pass: p@ssw0rd + # Database settings odoo_db_server: "{{ pg_server | default('localhost') }}" odoo_db_port: 5432 diff --git a/roles/odoo/tasks/conf.yml b/roles/odoo/tasks/conf.yml index 43c87cd..63dcce7 100644 --- a/roles/odoo/tasks/conf.yml +++ b/roles/odoo/tasks/conf.yml @@ -16,6 +16,9 @@ command: "{{ odoo_root_dir }}/venv/bin/python3 {{ odoo_root_dir }}/app/setup/odoo -c {{ odoo_root_dir }}/etc/odoo-server.conf -d {{ odoo_db_name }} -i base -u all --stop-after-init --syslog" become_user: "{{ odoo_user }}" + - name: Restore SELinux context + command: restorecon -R {{ odoo_root_dir }} + tags: odoo - name: Install nginx configuration diff --git a/roles/odoo/tasks/facts.yml b/roles/odoo/tasks/facts.yml index 01e7cd1..703cd44 100644 --- a/roles/odoo/tasks/facts.yml +++ b/roles/odoo/tasks/facts.yml @@ -27,3 +27,13 @@ - set_fact: odoo_db_pass={{ rand_pass }} when: odoo_db_pass is not defined tags: odoo + +# Create a random pass for the DB Manager +- block: + - import_tasks: ../includes/get_rand_pass.yml + vars: + - pass_file: "{{ odoo_root_dir }}/meta/ansible_db_manager_pass" + - set_fact: odoo_db_manager_pass={{ rand_pass }} + when: odoo_db_manager_pass is not defined and odoo_db_manager + tags: odoo + diff --git a/roles/odoo/tasks/install.yml b/roles/odoo/tasks/install.yml index 7214c76..10757bf 100644 --- a/roles/odoo/tasks/install.yml +++ b/roles/odoo/tasks/install.yml @@ -56,6 +56,16 @@ - phonenumbers - python-jose - flanker + - redis + - pdfminer + - dnsq + tags: odoo + +# This is needed as the first import from flanker needs to create files not writeable by the Odoo user +# See https://github.com/Tecnativa/doodba/pull/487 +- name: Finish flanker install + command: "{{ odoo_root_dir }}/venv/bin/python3 -c 'from flanker.addresslib import address'" + changed_when: False tags: odoo - name: Create the PostgreSQL role diff --git a/roles/odoo/templates/odoo-server.conf.j2 b/roles/odoo/templates/odoo-server.conf.j2 index f65d7a0..60201d0 100644 --- a/roles/odoo/templates/odoo-server.conf.j2 +++ b/roles/odoo/templates/odoo-server.conf.j2 @@ -1,5 +1,7 @@ [options] -{% if not odoo_db_manager %} +{% if odoo_db_manager %} +admin_passwd = {{ odoo_db_manager_pass }} +{% else %} db_name = {{ odoo_db_name }} {% endif %} db_host = {{ odoo_db_server }} @@ -16,4 +18,6 @@ smtp_server = localhost data_dir = {{ odoo_root_dir }}/data without_demo = ALL init = base - +limit_request = 16384 +limit_time_cpu = 900 +limit_time_real = 1800 diff --git a/roles/odoo/vars/RedHat-8.yml b/roles/odoo/vars/RedHat-8.yml index dcca677..5540706 100644 --- a/roles/odoo/vars/RedHat-8.yml +++ b/roles/odoo/vars/RedHat-8.yml @@ -1,8 +1,8 @@ --- odoo_packages: - - python3.11-pip - - python3.11-devel + - python39-pip + - python39-devel - gcc - gcc-c++ - libxml2-devel @@ -16,4 +16,4 @@ odoo_packages: - git - acl -odoo_venv_command: /bin/python3.11 -m venv +odoo_venv_command: /bin/python3.9 -m venv diff --git a/roles/odoo/vars/RedHat-9.yml b/roles/odoo/vars/RedHat-9.yml index dcca677..de18926 100644 --- a/roles/odoo/vars/RedHat-9.yml +++ b/roles/odoo/vars/RedHat-9.yml @@ -1,8 +1,8 @@ --- odoo_packages: - - python3.11-pip - - python3.11-devel + - python3-pip + - python3-devel - gcc - gcc-c++ - libxml2-devel @@ -16,4 +16,4 @@ odoo_packages: - git - acl -odoo_venv_command: /bin/python3.11 -m venv +odoo_venv_command: /bin/python3.9 -m venv