From 5ef70015cbaaaa6ff91651ceb52b19870106463b Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sat, 5 Nov 2022 12:09:32 +0200
Subject: [PATCH] Ensure git is installed using ansible.builtin.package, not
 using a distro-specific package manager module

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
---
 .../ext/mjolnir-antispam/setup_install.yml    | 25 +++----------------
 .../synapse-simple-antispam/setup_install.yml | 25 +++----------------
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml
index 117fb7576..5d36a2348 100644
--- a/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/ext/mjolnir-antispam/setup_install.yml
@@ -1,28 +1,9 @@
 ---
 
-- name: Ensure git installed (RedHat)
-  ansible.builtin.yum:
-    name:
-      - git
+- name: Ensure git installed
+  ansible.builtin.package:
+    name: git
     state: present
-    update_cache: false
-  when: "ansible_os_family == 'RedHat'"
-
-- name: Ensure git installed (Debian)
-  ansible.builtin.apt:
-    name:
-      - git
-    state: present
-    update_cache: false
-  when: "ansible_os_family == 'Debian'"
-
-- name: Ensure git installed (Archlinux)
-  community.general.pacman:
-    name:
-      - git
-    state: present
-    update_cache: false
-  when: "ansible_distribution == 'Archlinux'"
 
 - name: Clone mjolnir-antispam git repository
   ansible.builtin.git:
diff --git a/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml
index dd3ff2d3f..15fe220ab 100644
--- a/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml
@@ -5,29 +5,10 @@
     msg: "Synapse Simple Antispam is enabled, but no blocked homeservers have been set in matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers"
   when: "matrix_synapse_ext_spam_checker_synapse_simple_antispam_config_blocked_homeservers | length == 0"
 
-- name: Ensure git installed (RedHat)
-  ansible.builtin.yum:
-    name:
-      - git
+- name: Ensure git installed
+  ansible.builtin.package:
+    name: git
     state: present
-    update_cache: false
-  when: "ansible_os_family == 'RedHat'"
-
-- name: Ensure git installed (Debian)
-  ansible.builtin.apt:
-    name:
-      - git
-    state: present
-    update_cache: false
-  when: "ansible_os_family == 'Debian'"
-
-- name: Ensure git installed (Archlinux)
-  community.general.pacman:
-    name:
-      - git
-    state: present
-    update_cache: false
-  when: "ansible_distribution == 'Archlinux'"
 
 - name: Clone synapse-simple-antispam git repository
   ansible.builtin.git: