Replace some CentOS references to support other RHEL derivatives

Not hardcoding 'CentOS' and using the OS family ('RedHat') instead,
we now behave better on Rockylinux and AlmaLinux, etc.

With that said, we may or may not fully support CentOS/Rockylinux/AlmaLinux v8 yet.
Certain things were improved in
https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300.

v8 support is discussed here: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/300
Certain things (firewalld?) may still be problematic. This patch does not try to address those.
If the remaining issues are confirmed to be fixed in the future, we can mark v8 as supported.
This commit is contained in:
Slavi Pantaleev 2022-02-06 18:05:25 +02:00
parent b244ab477c
commit a095accce7
7 changed files with 15 additions and 15 deletions

View file

@ -98,8 +98,8 @@ matrix_host_command_openssl: "/usr/bin/env openssl"
matrix_host_command_systemctl: "/usr/bin/env systemctl" matrix_host_command_systemctl: "/usr/bin/env systemctl"
matrix_host_command_sh: "/usr/bin/env sh" matrix_host_command_sh: "/usr/bin/env sh"
matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') else ( 'systemd' if ansible_os_family == 'Suse' else 'ntp' ) }}" matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') else ( 'systemd' if ansible_os_family == 'Suse' else 'ntp' ) }}"
matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') or ansible_distribution == 'Archlinux' or ansible_os_family == 'Suse' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}" matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') or ansible_distribution == 'Archlinux' or ansible_os_family == 'Suse' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}" matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"

View file

@ -1,10 +1,10 @@
--- ---
- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos.yml" - include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat.yml"
when: ansible_distribution == 'CentOS' and ansible_distribution_major_version < '8' when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '8'
- include_tasks: "{{ role_path }}/tasks/server_base/setup_centos8.yml" - include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat8.yml"
when: ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7' when: ansible_os_family == 'RedHat' and ansible_distribution_major_version > '7'
- block: - block:
# ansible_lsb is only available if lsb-release is installed. # ansible_lsb is only available if lsb-release is installed.

View file

@ -1,11 +1,11 @@
# This is for both CentOS 7 and 8 # This is for both RedHat 7 and 8
- name: Ensure fuse installed (CentOS) - name: Ensure fuse installed (RedHat)
yum: yum:
name: name:
- fuse - fuse
state: latest state: latest
when: ansible_distribution == 'CentOS' when: ansible_os_family == 'RedHat'
# This is for both Debian and Raspbian # This is for both Debian and Raspbian
- name: Ensure fuse installed (Debian/Raspbian) - name: Ensure fuse installed (Debian/Raspbian)

View file

@ -1,11 +1,11 @@
# This is for both CentOS 7 and 8 # This is for both RedHat 7 and 8
- name: Ensure openssl installed (CentOS) - name: Ensure openssl installed (RedHat)
yum: yum:
name: name:
- openssl - openssl
state: latest state: latest
when: ansible_distribution == 'CentOS' when: ansible_os_family == 'RedHat'
# This is for both Debian and Raspbian # This is for both Debian and Raspbian
- name: Ensure openssl installed (Debian/Raspbian) - name: Ensure openssl installed (Debian/Raspbian)

View file

@ -62,10 +62,10 @@
update_cache: yes update_cache: yes
when: (ansible_os_family == 'Debian') when: (ansible_os_family == 'Debian')
- name: Ensure gradle is installed for self-building (CentOS) - name: Ensure gradle is installed for self-building (RedHat)
fail: fail:
msg: "Installing gradle on CentOS is currently not supported, so self-building ma1sd cannot happen at this time" msg: "Installing gradle on RedHat ({{ ansible_distribution }}) is currently not supported, so self-building ma1sd cannot happen at this time"
when: ansible_distribution == 'CentOS' when: ansible_os_family == 'RedHat'
- name: Ensure gradle is installed for self-building (Archlinux) - name: Ensure gradle is installed for self-building (Archlinux)
pacman: pacman: