From 7a692c3e447723bcd34cf14efab1a3e2803581d4 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 24 Mar 2022 13:00:15 +0100 Subject: [PATCH] Update to 2022-03-24 13:00 --- roles/maven/defaults/main.yml | 4 ++-- roles/maven/tasks/install.yml | 2 +- roles/metabase/defaults/main.yml | 6 +++--- roles/metabase/tasks/conf.yml | 4 ++++ roles/metabase/tasks/directories.yml | 4 ++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/roles/maven/defaults/main.yml b/roles/maven/defaults/main.yml index bba01c6..d569d67 100644 --- a/roles/maven/defaults/main.yml +++ b/roles/maven/defaults/main.yml @@ -1,6 +1,6 @@ --- -mvn_version: 3.8.4 +mvn_version: 3.8.5 mvn_archive_url: https://miroir.univ-lorraine.fr/apache/maven/maven-3/{{ mvn_version }}/binaries/apache-maven-{{ mvn_version }}-bin.tar.gz -mvn_archive_sha1: 81a9f75f19aa7275152c262bcea1a77223b93445 +mvn_archive_sha256: 88e30700f32a3f60e0d28d0f12a3525d29b7c20c72d130153df5b5d6d890c673 mvn_root_dir: /opt/maven diff --git a/roles/maven/tasks/install.yml b/roles/maven/tasks/install.yml index 19dddfb..5c27488 100644 --- a/roles/maven/tasks/install.yml +++ b/roles/maven/tasks/install.yml @@ -12,7 +12,7 @@ get_url: url: "{{ mvn_archive_url }}" dest: "{{ mvn_root_dir }}/tmp/" - checksum: sha1:{{ mvn_archive_sha1 }} + checksum: sha256:{{ mvn_archive_sha256 }} - name: Extract maven archive unarchive: diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml index 79f80e4..6990343 100644 --- a/roles/metabase/defaults/main.yml +++ b/roles/metabase/defaults/main.yml @@ -1,15 +1,15 @@ --- # Version to deploy -metabase_version: 0.42.2 +metabase_version: 0.42.3 # 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: d74f9b67a0017ffa377dbaad2426bd02cff2af72b69982d8b3f2c1596fe1455f +metabase_jar_sha256: 3a80abf84b968b1bf57200c14542a8a30ed9f4e2182feb2feb7c75883d29df82 # 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: b99f84e3c4ff0ffaf2023dd522a668fcbe8d6352746cc8e8f62e01df7bd9d4d1 +metabase_archive_sha256: f0217b9649b1cf62f9b1762b9e9d8965b524817d27040426b1d164812877593f # 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/metabase/tasks/conf.yml b/roles/metabase/tasks/conf.yml index 4a5bede..cb9e237 100644 --- a/roles/metabase/tasks/conf.yml +++ b/roles/metabase/tasks/conf.yml @@ -1,5 +1,9 @@ --- +- name: Link system CA as postgres root cert + file: src=/etc/pki/tls/cert.pem dest={{ metabase_root_dir }}/.postgresql/root.crt state=link + tags: metabase + - name: Deploy configuration template: src=env.j2 dest={{ metabase_root_dir }}/etc/env group={{ metabase_user }} mode=640 notify: restart metabase diff --git a/roles/metabase/tasks/directories.yml b/roles/metabase/tasks/directories.yml index f2780e3..63afff4 100644 --- a/roles/metabase/tasks/directories.yml +++ b/roles/metabase/tasks/directories.yml @@ -7,6 +7,10 @@ owner: "{{ metabase_user }}" group: "{{ metabase_user }}" - dir: "{{ metabase_root_dir }}/app" + - dir: "{{ metabase_root_dir }}/.postgresql" + owner: "{{ metabase_user }}" + group: "{{ metabase_user }}" + mode: 700 - dir: "{{ metabase_root_dir }}/tmp" owner: "{{ metabase_user }}" group: "{{ metabase_user }}"