From 663f0bc5efd51c1fd198c5a87e2f278cbe180756 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 5 Nov 2022 12:10:59 +0200 Subject: [PATCH] Install openssl using ansible.builtin.package, not using a distro-specific package manager module Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228 --- .../matrix-base/tasks/ensure_openssl_installed.yml | 14 ++++---------- .../tasks/ensure_openssl_installed_archlinux.yml | 6 ------ .../tasks/ensure_openssl_installed_debian.yml | 6 ------ .../tasks/ensure_openssl_installed_redhat.yml | 6 ------ 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 roles/custom/matrix-base/tasks/ensure_openssl_installed_archlinux.yml delete mode 100644 roles/custom/matrix-base/tasks/ensure_openssl_installed_debian.yml delete mode 100644 roles/custom/matrix-base/tasks/ensure_openssl_installed_redhat.yml diff --git a/roles/custom/matrix-base/tasks/ensure_openssl_installed.yml b/roles/custom/matrix-base/tasks/ensure_openssl_installed.yml index 889531f9e..d0cd8edea 100644 --- a/roles/custom/matrix-base/tasks/ensure_openssl_installed.yml +++ b/roles/custom/matrix-base/tasks/ensure_openssl_installed.yml @@ -1,12 +1,6 @@ --- -# This is for both RedHat 7 and 8 -- ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_openssl_installed_redhat.yml" - when: ansible_os_family == 'RedHat' - -# This is for both Debian and Raspbian -- ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_openssl_installed_debian.yml" - when: ansible_os_family == 'Debian' - -- ansible.builtin.include_tasks: "{{ role_path }}/tasks/ensure_openssl_installed_archlinux.yml" - when: ansible_os_family == 'Archlinux' +- name: Ensure openssl installed + ansible.builtin.package: + name: openssl + state: present diff --git a/roles/custom/matrix-base/tasks/ensure_openssl_installed_archlinux.yml b/roles/custom/matrix-base/tasks/ensure_openssl_installed_archlinux.yml deleted file mode 100644 index ce70c5624..000000000 --- a/roles/custom/matrix-base/tasks/ensure_openssl_installed_archlinux.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- name: Ensure openssl installed (Archlinux) - community.general.pacman: - name: openssl - state: present diff --git a/roles/custom/matrix-base/tasks/ensure_openssl_installed_debian.yml b/roles/custom/matrix-base/tasks/ensure_openssl_installed_debian.yml deleted file mode 100644 index 18f1cb95e..000000000 --- a/roles/custom/matrix-base/tasks/ensure_openssl_installed_debian.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- name: Ensure openssl installed (Debian/Raspbian) - ansible.builtin.apt: - name: openssl - state: present diff --git a/roles/custom/matrix-base/tasks/ensure_openssl_installed_redhat.yml b/roles/custom/matrix-base/tasks/ensure_openssl_installed_redhat.yml deleted file mode 100644 index b8809cf55..000000000 --- a/roles/custom/matrix-base/tasks/ensure_openssl_installed_redhat.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- name: Ensure openssl installed (RedHat) - ansible.builtin.yum: - name: openssl - state: present