From fe7d09b9cd29c9226d9a5de569f8d0c85c15abc7 Mon Sep 17 00:00:00 2001
From: Emilien Mantel <emilien.mantel@triplestack.fr>
Date: Mon, 28 Feb 2022 10:11:30 +0100
Subject: [PATCH] :boom: Add newer method to setup upstream packages

---
 README.md                          | 17 ++++++------
 defaults/main.yml                  | 11 +++-----
 tasks/install/mariadb/upstream.yml | 43 +++++++++++++++++-------------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 6e49cfb..c5c6595 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@ MariaDB (MySQL) Ansible role for Debian
 
 Install and configure MariaDB (Galera Cluster). Manage replication (master/slave). Create users and databases.
 
-| OS              | Origin    | MariaDB versions          |
-| --------------- | --------- | ------------------------- |
-| Debian Buster   | Debian    | 10.3                      |
-| Debian Buster   | Upstream  | 10.3 to 10.6              |
-| Debian Bullseye | Debian    | 10.5                      |
-| Debian Bullseye | Upstream  | 10.5 to 10.6              |
+| OS              | Origin    | MariaDB versions  |
+| --------------- | --------- | ----------------- |
+| Debian Buster   | Debian    | 10.3              |
+| Debian Buster   | Upstream  | Up from 10.3      |
+| Debian Bullseye | Debian    | 10.5              |
+| Debian Bullseye | Upstream  | Up from 10.5      |
 
 
 Notes
@@ -61,12 +61,11 @@ Check "priv" syntax in [mysql\_user module documentation](http://docs.ansible.co
 
 ### Packaging
 
-- `mariadb_version`: depends Debian version
-- `mariadb_repository`: MariaDB upstream APT repository (see: [MariaDB repositories tool](https://downloads.mariadb.org/mariadb/repositories))
+- `mariadb_upstream_version`: depends Debian version
 
 ### Other
 
-- `mariadb_debug_role`: boolean, set true to disable no_log hidding
+- `mariadb_debug_role`: boolean, set true to disable `no_log` hidding
 
 Dependencies
 ------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 58d339e..35b17f7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,7 +6,6 @@
 mariadb_origin: 'default'
 mariadb_use_galera: false
 mariadb_notify_restart: true
-mariadb_upstream_apt_src: false
 
 # -------------------------------------
 # Configuration
@@ -115,14 +114,10 @@ mariadb_databases: []
 mariadb_users: []
 
 # -------------------------------------
-# MariaDB
+# MariaDB Upstream
 # -------------------------------------
-mariadb_version: '10.6'
-mariadb_mirror_domain: "ftp.igh.cnrs.fr"
-# See: https://downloads.mariadb.org/mariadb/repositories
-mariadb_repository: "http://{{ mariadb_mirror_domain }}/pub/mariadb/repo/{{ mariadb_version }}/debian"
-mariadb_key_server: "keyserver.ubuntu.com"
-mariadb_key_ids: ['0xcbcb082a1bb943db', '0xf1656f24c74cd1d8']
+mariadb_upstream_setup_script: 'https://r.mariadb.com/downloads/mariadb_repo_setup'
+mariadb_upstream_version: '10.6'
 
 # -------------------------------------
 # Galera
diff --git a/tasks/install/mariadb/upstream.yml b/tasks/install/mariadb/upstream.yml
index 8fced76..4551a67 100644
--- a/tasks/install/mariadb/upstream.yml
+++ b/tasks/install/mariadb/upstream.yml
@@ -4,25 +4,30 @@
   ansible.builtin.apt:
     name: gpg
 
-- name: APT_KEY | Install MariaDB key
-  ansible.builtin.apt_key:
-    keyserver: "{{ mariadb_key_server }}"
-    id: "{{ item }}"
-  loop: "{{ mariadb_key_ids }}"
+- name: COMMAND | Check indempotent
+  ansible.builtin.apt.command: 'grep -q {{ mariadb_upstream_version }} /etc/apt/sources.list.d/mariadb.list'
+  register: check_idempotent
+  failed_when: false
+  changed_when: false
 
-- name: TEMPLATE | Deploy APT pinning (prevent upgrades from Debian)
-  ansible.builtin.template:
-    src: etc/apt/preferences.d/95-mariadb.j2
-    dest: /etc/apt/preferences.d/95-mariadb
-    mode: 0644
-    owner: root
-    group: root
+- block:
 
-- name: APT_REPOSITORY | Add MariaDB repository
-  ansible.builtin.apt_repository:
-    repo: 'deb {{ mariadb_repository }} {{ ansible_distribution_release }} main'
+    - name: GET_URL | Download MariaDB setup script
+      ansible.builtin.get_url:
+        url: '{{ mariadb_upstream_setup_script }}'
+        dest: '/tmp/mariadb_repo_setup'
+        mode: 0755
+        owner: root
+        group: root
 
-- name: APT_REPOSITORY | Add MariaDB (src) repository
-  ansible.builtin.apt_repository:
-    repo: 'deb-src {{ mariadb_repository }} {{ ansible_distribution_release }} main'
-  when: mariadb_upstream_apt_src
+    - name: COMMAND | Launch MariaDB upstream setup script
+      ansible.builtin.command: '/tmp/mariadb_repo_setup --mariadb-server-version={{ mariadb_upstream_version }}'
+
+  when: check_idempotent.rc > 0
+
+- name: SHELL | Remove useless old files
+  ansible.builtin.shell: 'rm -f /etc/apt/sources.list.d/mariadb.list.old_*'
+  args:
+    removes: /etc/apt/sources.list.d/mariadb.list.old_1
+  tags:
+    - skip_ansible_lint