From d9515c7aaba758b0d9cd285fd74f6760a9774d35 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 27 May 2024 17:01:00 +0200 Subject: [PATCH] Update to 2024-05-27 17:01 --- roles/bookstack/defaults/main.yml | 4 ++-- roles/cni_plugins/defaults/main.yml | 4 ++-- roles/consul_bin/defaults/main.yml | 4 ++-- roles/diagrams/defaults/main.yml | 4 ++-- roles/gitea/defaults/main.yml | 4 ++-- roles/kimai/defaults/main.yml | 4 ++-- roles/ldap2pg/defaults/main.yml | 4 ++-- roles/matrix_element/defaults/main.yml | 4 ++-- roles/matrix_synapse/defaults/main.yml | 2 +- roles/n8n/defaults/main.yml | 2 +- roles/odoo/defaults/main.yml | 2 +- roles/odoo/tasks/conf.yml | 8 +++++--- roles/odoo/tasks/install.yml | 5 ++++- roles/odoo/vars/RedHat-8.yml | 6 +++--- roles/odoo/vars/RedHat-9.yml | 6 +++--- roles/pgweb/vars/RedHat-9.yml | 5 +++++ roles/sftpgo/defaults/main.yml | 4 ++-- 17 files changed, 41 insertions(+), 31 deletions(-) create mode 100644 roles/pgweb/vars/RedHat-9.yml diff --git a/roles/bookstack/defaults/main.yml b/roles/bookstack/defaults/main.yml index e86b283..814dba2 100644 --- a/roles/bookstack/defaults/main.yml +++ b/roles/bookstack/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to deploy -bookstack_version: '24.05' +bookstack_version: '24.05.1' # URL of the arhive bookstack_archive_url: https://github.com/BookStackApp/BookStack/archive/v{{ bookstack_version }}.tar.gz # Expected sha256 of the archive -bookstack_archive_sha256: 12673a0c69ce5cea5ae0b0be568da7a88c8510b9cd9e96e7cdeb4026a355482f +bookstack_archive_sha256: 64b484710a2683e75283497a566b4311d2df4d24ae11eccc87620940afe218c6 # Should ansible handle bookstack upgrades or just the inintial install bookstack_manage_upgrade: True diff --git a/roles/cni_plugins/defaults/main.yml b/roles/cni_plugins/defaults/main.yml index e3366b9..aff726f 100644 --- a/roles/cni_plugins/defaults/main.yml +++ b/roles/cni_plugins/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of the CNI plugins to install -cni_version: 1.4.1 +cni_version: 1.5.0 # Archive where the pre compiled bin archive will be downloaded cni_archive_url: https://github.com/containernetworking/plugins/releases/download/v{{ cni_version }}/cni-plugins-linux-amd64-v{{ cni_version }}.tgz # Expected checksum of the archive -cni_archive_sha256: 1511f6c003ace805eafeb1132727791326283cff88a923d76329e1892bba7a10 +cni_archive_sha256: 57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 # Where the plugins will be installed (binaries will be extracted in a /bin sub-directory) cni_root_dir: /opt/cni diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml index 1ef8a2b..015d2e9 100644 --- a/roles/consul_bin/defaults/main.yml +++ b/roles/consul_bin/defaults/main.yml @@ -1,8 +1,8 @@ --- # Version of consul to deploy -consul_version: 1.18.1 +consul_version: 1.18.2 # URL from where the consul archive will be downloaded consul_archive_url: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip # Expected sha256 of the archive -consul_archive_sha256: 5faa9cc3f2832e3ae454a3ec2dbc6799179d14e1e09463f220bb906c590f4b05 +consul_archive_sha256: 522045180a4e644af6e2d97824850b470545f176aabdb4898635afda512a6a3f diff --git a/roles/diagrams/defaults/main.yml b/roles/diagrams/defaults/main.yml index e8e2a14..380f546 100644 --- a/roles/diagrams/defaults/main.yml +++ b/roles/diagrams/defaults/main.yml @@ -1,11 +1,11 @@ --- # Veresion of diagrams to deploy -diagrams_version: 24.4.0 +diagrams_version: 24.4.4 # URL of the WAR file to deploy diagrams_war_url: https://github.com/jgraph/drawio/releases/download/v{{ diagrams_version }}/draw.war # Expected sha256 of the WAR file -diagrams_war_sha256: cea87df556b9fa802a346aabeb16f917e3ecceb1f625f72c05cfc2b9a1318778 +diagrams_war_sha256: ec789182442cb8555a04f6e46b9e625cdfae93e09c2c9130244e9d9adf12d68a # root directory of the installation diagrams_root_dir: /opt/diagrams # Should ansible manage upgrades, or just initial install ? diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index 9fbfd0b..1ca4a72 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to install -gitea_version: 1.21.11 +gitea_version: '1.22.0' # URL to the binary gitea_bin_url: https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64 # sha256 of the binary -gitea_bin_sha256: 238056fa4616633a9ec5a358aac75275bd3f271d5e5238af3dd5f22c713fe97e +gitea_bin_sha256: a31086f073cb9592d28611394b2de3655db515d961e4fdcf5b549cb40753ef3d # Handle updates. If set to false, ansible will only install # Gitea and then won't touch an existing installation gitea_manage_upgrade: True diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index 3260402..015c374 100644 --- a/roles/kimai/defaults/main.yml +++ b/roles/kimai/defaults/main.yml @@ -5,12 +5,12 @@ # You can set it to a number or a simple string (no special chars) kimai_id: 1 # Kimai version to deploy -kimai_version: '2.16.1' +kimai_version: '2.17.0' # URL of the archive kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz # Expected sha256 of the archive -kimai_archive_sha256: 77c3b470c82552eddaf4da962def94a201d0a60b34bd6cd91128ecc149f59ac5 +kimai_archive_sha256: 354a308c513f0bf0296b5acd15733a14940657f7ee0c460c721ce7e3a168cd52 # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} # Should ansible handle upgrades or only initial install diff --git a/roles/ldap2pg/defaults/main.yml b/roles/ldap2pg/defaults/main.yml index 23e5a4f..afc03ca 100644 --- a/roles/ldap2pg/defaults/main.yml +++ b/roles/ldap2pg/defaults/main.yml @@ -1,13 +1,13 @@ --- # The version of ldap2pg to deploy -ldap2pg_version: 6.0 +ldap2pg_version: 6.1 # The URL where the ldap2pg archive can be fetched ldap2pg_archive_url: https://github.com/dalibo/ldap2pg/releases/download/v{{ ldap2pg_version }}/ldap2pg_{{ ldap2pg_version }}_linux_amd64.tar.gz # The expected sha256 checksum of the archive -ldap2pg_archive_sha256: 0f587cb6a6e4953820fabcaba46bbfbe9acdffe79c42b1f53e789f5d7215d26b +ldap2pg_archive_sha256: 887bf2a247273e18597ccb949d9500faba24a150cfb403967a5d93d185c450e3 # How often ldap2pg will sync (eg hourly, '*:0:15', systemd timer syntaxe) ldap2pg_sync_freq: hourly diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml index 62dd533..4478402 100644 --- a/roles/matrix_element/defaults/main.yml +++ b/roles/matrix_element/defaults/main.yml @@ -5,8 +5,8 @@ element_id: element # Version to deploy, and expected sha256 -element_version: 1.11.65 -element_archive_sha256: 069dd851afced0d82ecb815d408c618c42311a2b7671b8a6479d21edcb5e80e9 +element_version: 1.11.66 +element_archive_sha256: 4bab7bf011f650a94f2bc0a6e8f0f0cb7fe59975f3cced1cb270c47419169c37 # Where to install element element_root_dir: /opt/matrix/element diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index 0e6f3b8..034cb66 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.105.1' +synapse_version: '1.107.0' # Should ansible handle Synapse upgrades ? If false, only initial install will be done synapse_manage_upgrade: True diff --git a/roles/n8n/defaults/main.yml b/roles/n8n/defaults/main.yml index e9045b1..7a43909 100644 --- a/roles/n8n/defaults/main.yml +++ b/roles/n8n/defaults/main.yml @@ -1,7 +1,7 @@ --- # Version to deploy -n8n_version: 1.41.0 +n8n_version: 1.42.1 # Root directory where n8n will be installed n8n_root_dir: /opt/n8n # User account under which n8n will run diff --git a/roles/odoo/defaults/main.yml b/roles/odoo/defaults/main.yml index 4b23452..b39b875 100644 --- a/roles/odoo/defaults/main.yml +++ b/roles/odoo/defaults/main.yml @@ -1,7 +1,7 @@ --- # Version of Odoo to deploy (name of the branch of the git repo -odoo_version: 16.0 +odoo_version: 17.0 # URL of the repository odoo_git_url: https://github.com/odoo/odoo.git diff --git a/roles/odoo/tasks/conf.yml b/roles/odoo/tasks/conf.yml index 63dcce7..c86b888 100644 --- a/roles/odoo/tasks/conf.yml +++ b/roles/odoo/tasks/conf.yml @@ -5,7 +5,7 @@ notify: restart odoo-server tags: odoo -- when: odoo_install_mode != 'none' +- when: odoo_install_mode == 'install' block: - name: Install odoo command: "{{ odoo_root_dir }}/venv/bin/python3 {{ odoo_root_dir }}/app/setup.py install" @@ -16,9 +16,11 @@ 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: Restore SELinux context + command: restorecon -R {{ odoo_root_dir }} + when: odoo_install_mode != 'none' tags: odoo - name: Install nginx configuration diff --git a/roles/odoo/tasks/install.yml b/roles/odoo/tasks/install.yml index 10757bf..b9fd73b 100644 --- a/roles/odoo/tasks/install.yml +++ b/roles/odoo/tasks/install.yml @@ -16,11 +16,14 @@ notify: restart odoo-server - name: Add ACL - command: | + shell: | setfacl -R -b -k {{ odoo_root_dir }} setfacl -m u:nginx:X {{ odoo_root_dir }} setfacl -R -m u:nginx:rX {{ odoo_root_dir }}/data {{ odoo_root_dir }}/app/addons {{ odoo_root_dir }}/app/odoo/addons {{ odoo_root_dir }}/enterprise + - name: Wipe the venv + file: path={{odoo_root_dir }}/venv state=absent + tags: odoo - when: odoo_install_mode != 'none' and odoo_enterprise diff --git a/roles/odoo/vars/RedHat-8.yml b/roles/odoo/vars/RedHat-8.yml index 1e0c945..633a15f 100644 --- a/roles/odoo/vars/RedHat-8.yml +++ b/roles/odoo/vars/RedHat-8.yml @@ -1,8 +1,8 @@ --- odoo_packages: - - python39-pip - - python39-devel + - python3.11-pip + - python3.11-devel - gcc - gcc-c++ - libxml2-devel @@ -16,4 +16,4 @@ odoo_packages: - git - acl -odoo_venv_command: /bin/python3.9 -m venv +odoo_venv_command: /bin/python3.11 -m venv diff --git a/roles/odoo/vars/RedHat-9.yml b/roles/odoo/vars/RedHat-9.yml index ccbe653..633a15f 100644 --- a/roles/odoo/vars/RedHat-9.yml +++ b/roles/odoo/vars/RedHat-9.yml @@ -1,8 +1,8 @@ --- odoo_packages: - - python3-pip - - python3-devel + - python3.11-pip + - python3.11-devel - gcc - gcc-c++ - libxml2-devel @@ -16,4 +16,4 @@ odoo_packages: - git - acl -odoo_venv_command: /bin/python3.9 -m venv +odoo_venv_command: /bin/python3.11 -m venv diff --git a/roles/pgweb/vars/RedHat-9.yml b/roles/pgweb/vars/RedHat-9.yml new file mode 100644 index 0000000..6f8faac --- /dev/null +++ b/roles/pgweb/vars/RedHat-9.yml @@ -0,0 +1,5 @@ +--- + +pgweb_packages: + - tar + - zstd diff --git a/roles/sftpgo/defaults/main.yml b/roles/sftpgo/defaults/main.yml index 42ba0ae..0a84152 100644 --- a/roles/sftpgo/defaults/main.yml +++ b/roles/sftpgo/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to deploy -sftpgo_version: 2.5.6 +sftpgo_version: 2.6.0 # URL of the archive sftpgo_archive_url: https://github.com/drakkan/sftpgo/releases/download/v{{ sftpgo_version }}/sftpgo_v{{ sftpgo_version }}_linux_x86_64.tar.xz # Expected sha1 of the archive -sftpgo_archive_sha256: 8a1c614511343f184d75bf22b1546fdabe31b4ce30c62e08eeac1e52ed83e53c +sftpgo_archive_sha256: 7768a1f21f9233a2971ea2d3a1759710188eafd69dfb3a3039239581967c33ad # Should ansible handle upgrades ? If False, only initial install will be done sftpgo_manage_upgrade: True