From 364f212977d8a4e17709ef5d094d8e4f6195c7d2 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 3 Jul 2023 11:00:09 +0200
Subject: [PATCH] Update to 2023-07-03 11:00

---
 roles/metabase/defaults/main.yml          |  6 +++---
 roles/vault_server/defaults/main.yml      |  7 -------
 roles/vault_server/tasks/archive_post.yml | 14 --------------
 roles/vault_server/tasks/archive_pre.yml  | 10 ----------
 roles/vault_server/tasks/cleanup.yml      |  3 +--
 roles/vault_server/tasks/directories.yml  |  4 ----
 roles/vault_server/tasks/install.yml      |  3 ---
 roles/vault_server/tasks/main.yml         |  8 --------
 8 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 roles/vault_server/tasks/archive_post.yml
 delete mode 100644 roles/vault_server/tasks/archive_pre.yml

diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml
index fe764b9..7347e42 100644
--- a/roles/metabase/defaults/main.yml
+++ b/roles/metabase/defaults/main.yml
@@ -1,15 +1,15 @@
 ---
 
 # Version to deploy
-metabase_version: 0.46.5
+metabase_version: 0.46.6
 # 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: e45f01438da1ba7faa524ebf5f57524e58511970443eaf61d087c91c0efb38ec
+metabase_jar_sha256: 8511069190e54d08cdd35dbf89333c2031eb5bbdb637ee20546b6c547e91e64a
 # 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: 1b887755da494cd9ee9d756d087d2e5e81acad326f1f1e15aa3fb888809e7597
+metabase_archive_sha256: 47e88a0e4aa275090274f0179f5a069bebe10b9cfd820f93fce0bf004d177272
 # 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/vault_server/defaults/main.yml b/roles/vault_server/defaults/main.yml
index 0995b0a..f65f117 100644
--- a/roles/vault_server/defaults/main.yml
+++ b/roles/vault_server/defaults/main.yml
@@ -1,12 +1,5 @@
 ---
 
-# Version of Vault to install
-vault_version: 1.14.0
-# URL of the archive
-vault_archive_url: https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip
-# Expected sha256 of the archive
-vault_archive_sha256: 3d5c27e35d8ed43d861e892fc7d8f888f2fda4319a36f344f8c09603fb184b50
-
 # Root dir where Nomad will be installed
 vault_root_dir: /opt/vault
 
diff --git a/roles/vault_server/tasks/archive_post.yml b/roles/vault_server/tasks/archive_post.yml
deleted file mode 100644
index 61b0637..0000000
--- a/roles/vault_server/tasks/archive_post.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-- name: Compress previous version
-  command: tar cf {{ vault_root_dir }}/archives/{{ vault_current_version }}.tar.zst --use-compress-program=zstd ./
-  args:
-    chdir: "{{ vault_root_dir }}/archives/{{ vault_current_version }}"
-  environment:
-    ZSTD_CLEVEL: 10
-  tags: vault
-
-- name: Remove archive dir
-  file: path={{ vault_root_dir }}/archives/{{ vault_current_version }} state=absent
-  tags: vault
-
diff --git a/roles/vault_server/tasks/archive_pre.yml b/roles/vault_server/tasks/archive_pre.yml
deleted file mode 100644
index 236f6e5..0000000
--- a/roles/vault_server/tasks/archive_pre.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-
-- name: Create the archive dir
-  file: path={{ vault_root_dir }}/archives/{{ vault_current_version }} state=directory
-  tags: vault
-
-- name: Backup previous version
-  copy: src={{ vault_root_dir }}/bin/vault dest={{ vault_root_dir }}/archives/{{ vault_current_version }}/ remote_src=True
-  tags: vault
-
diff --git a/roles/vault_server/tasks/cleanup.yml b/roles/vault_server/tasks/cleanup.yml
index fea4ff1..f3671c5 100644
--- a/roles/vault_server/tasks/cleanup.yml
+++ b/roles/vault_server/tasks/cleanup.yml
@@ -3,6 +3,5 @@
 - name: Remove tmp and obsolete files
   file: path={{ item }} state=absent
   loop:
-    - "{{ vault_root_dir }}/tmp/vault_{{ vault_version }}_linux_amd64.zip"
-    - "{{ vault_root_dir }}/tmp/vault"
+    - "{{ vault_root_dir }}/archives"
   tags: vault
diff --git a/roles/vault_server/tasks/directories.yml b/roles/vault_server/tasks/directories.yml
index 870fa1b..197e4e4 100644
--- a/roles/vault_server/tasks/directories.yml
+++ b/roles/vault_server/tasks/directories.yml
@@ -7,10 +7,6 @@
       owner: root
       group: root
       mode: 755
-    - dir: archives
-      owner: root
-      group: root
-      mode: 700
     - dir: backup
       owner: root
       group: root
diff --git a/roles/vault_server/tasks/install.yml b/roles/vault_server/tasks/install.yml
index edb108e..07a2158 100644
--- a/roles/vault_server/tasks/install.yml
+++ b/roles/vault_server/tasks/install.yml
@@ -29,6 +29,3 @@
     dest: /etc/profile.d/vault.sh
     mode: 0755
   tags: vault
-
-- name: Write version
-  copy: content={{ vault_version }} destination={{ vault_root_dir }}/meta/ansible_version
diff --git a/roles/vault_server/tasks/main.yml b/roles/vault_server/tasks/main.yml
index a517c66..ca166ab 100644
--- a/roles/vault_server/tasks/main.yml
+++ b/roles/vault_server/tasks/main.yml
@@ -9,10 +9,6 @@
 - include_tasks: facts.yml
   tags: always
 
-- include_tasks: archive_pre.yml
-  when: vault_install_mode | default('none') == 'upgrade'
-  tags: always
-
 - include_tasks: install.yml
   tags: always
 
@@ -26,10 +22,6 @@
 - include_tasks: services.yml
   tags: always
 
-- include_tasks: archive_post.yml
-  when: vault_install_mode | default('none') == 'upgrade'
-  tags: always
-
 - include_tasks: cleanup.yml
   tags: always