Use the same role for CentOS and AlmaLinux

2021-02-08 12:52:24 +00:00 · 2021-02-08 12:52:24 +00:00 · 9aa3d6d9a4
commit 9aa3d6d9a4
parent 5a09a88af4
9 changed files with 6 additions and 6 deletions
--- a/admin-cli.yml
+++ b/admin-cli.yml
@ -9,12 +9,12 @@
    - include_role:
        name: arch
      when: ansible_distribution == 'Archlinux'
-    - include_role:
-        name: centos
-      when: ansible_distribution == 'CentOS'
    - include_role:
        name: debian
      when: ansible_distribution == 'Debian'
+    - include_role:
+        name: el
+      when: ansible_distribution == 'CentOS' or ansible_distribution == 'AlmaLinux'
    - include_role:
        name: fedora
      when: ansible_distribution == 'Fedora'
--- a/admin-gui.yml
+++ b/admin-gui.yml
@ -8,12 +8,12 @@
    - include_role:
        name: arch
      when: ansible_distribution == 'Archlinux'
-    - include_role:
-        name: centos
-      when: ansible_distribution == 'CentOS'
    - include_role:
        name: debian
      when: ansible_distribution == 'Debian'
+    - include_role:
+        name: el
+      when: ansible_distribution == 'CentOS' or ansible_distribution == 'AlmaLinux'
    - include_role:
        name: fedora
      when: ansible_distribution == 'Fedora'
--- a/roles/centos/files/70-solokeys-access.rules
+++ b/roles/centos/files/70-solokeys-access.rules
--- a/roles/centos/tasks/main.yml
+++ b/roles/centos/tasks/main.yml
--- a/roles/centos/tasks/modules.yml
+++ b/roles/centos/tasks/modules.yml
--- a/roles/centos/tasks/packages-cli.yml
+++ b/roles/centos/tasks/packages-cli.yml
--- a/roles/centos/tasks/packages-gui.yml
+++ b/roles/centos/tasks/packages-gui.yml
--- a/roles/centos/tasks/solokeys.yml
+++ b/roles/centos/tasks/solokeys.yml
--- a/roles/centos/tasks/ssh.yml
+++ b/roles/centos/tasks/ssh.yml