From b71ca5c787d3ab13974263caf9f40cbb88f832c8 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 23 Feb 2022 21:00:08 +0100
Subject: [PATCH] Update to 2022-02-23 21:00

---
 roles/letsencrypt/templates/domains.txt.j2 | 3 +++
 roles/vaultwarden/tasks/archive_pre.yml    | 4 ++++
 roles/vaultwarden/tasks/install.yml        | 4 +---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/roles/letsencrypt/templates/domains.txt.j2 b/roles/letsencrypt/templates/domains.txt.j2
index f313209..d94c42a 100644
--- a/roles/letsencrypt/templates/domains.txt.j2
+++ b/roles/letsencrypt/templates/domains.txt.j2
@@ -30,6 +30,9 @@
 {% if bitwarden_letsencrypt_cert is defined and bitwarden_letsencrypt_cert == True %}
 {{ bitwarden_public_url | urlsplit('hostname') }}
 {% endif %}
+{% if vaultwarden_letsencrypt_cert is defined and vaultwarden_letsencrypt_cert == True %}
+{{ vaultwarden_public_url | urlsplit('hostname') }}
+{% endif %}
 {% if psono_letsencrypt_cert is defined and psono_letsencrypt_cert == True %}
 {{ psono_public_url | urlsplit('hostname') }}
 {% endif %}
diff --git a/roles/vaultwarden/tasks/archive_pre.yml b/roles/vaultwarden/tasks/archive_pre.yml
index 4f4ac45..398bb1d 100644
--- a/roles/vaultwarden/tasks/archive_pre.yml
+++ b/roles/vaultwarden/tasks/archive_pre.yml
@@ -8,6 +8,10 @@
   service: name=vaultwarden state=stopped
   tags: vaultwarden
 
+- name: Ensure mysqldump is installed
+  package: name=mariadb
+  tags: vaultwarden
+
 - name: Archive current version
   synchronize:
     src: "{{ vaultwarden_root_dir }}/{{ item }}"
diff --git a/roles/vaultwarden/tasks/install.yml b/roles/vaultwarden/tasks/install.yml
index 768bd7f..9da7606 100644
--- a/roles/vaultwarden/tasks/install.yml
+++ b/roles/vaultwarden/tasks/install.yml
@@ -18,9 +18,7 @@
   tags: vaultwarden
 
 - name: Install MariaDB devel package
-  yum:
-    name:
-      - mariadb-devel
+  package: name={{ (mysql_mariadb_version is not defined or mysql_mariadb_version == 'default') | ternary('mariadb-devel', 'MariaDB-devel') }}
   when: vaultwarden_db_engine == 'mysql'
   tags: vaultwarden