From 9aa3d6d9a4ec4e1f854ab65c035b229c91792438 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Mon, 8 Feb 2021 12:52:24 +0000
Subject: [PATCH] Use the same role for CentOS and AlmaLinux
---
admin-cli.yml | 6 +++---
admin-gui.yml | 6 +++---
roles/{centos => el}/files/70-solokeys-access.rules | 0
roles/{centos => el}/tasks/main.yml | 0
roles/{centos => el}/tasks/modules.yml | 0
roles/{centos => el}/tasks/packages-cli.yml | 0
roles/{centos => el}/tasks/packages-gui.yml | 0
roles/{centos => el}/tasks/solokeys.yml | 0
roles/{centos => el}/tasks/ssh.yml | 0
9 files changed, 6 insertions(+), 6 deletions(-)
rename roles/{centos => el}/files/70-solokeys-access.rules (100%)
rename roles/{centos => el}/tasks/main.yml (100%)
rename roles/{centos => el}/tasks/modules.yml (100%)
rename roles/{centos => el}/tasks/packages-cli.yml (100%)
rename roles/{centos => el}/tasks/packages-gui.yml (100%)
rename roles/{centos => el}/tasks/solokeys.yml (100%)
rename roles/{centos => el}/tasks/ssh.yml (100%)
diff --git a/admin-cli.yml b/admin-cli.yml
index 699edd2..773f61b 100755
--- 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'
diff --git a/admin-gui.yml b/admin-gui.yml
index 2ea161b..6d26dde 100755
--- 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'
diff --git a/roles/centos/files/70-solokeys-access.rules b/roles/el/files/70-solokeys-access.rules
similarity index 100%
rename from roles/centos/files/70-solokeys-access.rules
rename to roles/el/files/70-solokeys-access.rules
diff --git a/roles/centos/tasks/main.yml b/roles/el/tasks/main.yml
similarity index 100%
rename from roles/centos/tasks/main.yml
rename to roles/el/tasks/main.yml
diff --git a/roles/centos/tasks/modules.yml b/roles/el/tasks/modules.yml
similarity index 100%
rename from roles/centos/tasks/modules.yml
rename to roles/el/tasks/modules.yml
diff --git a/roles/centos/tasks/packages-cli.yml b/roles/el/tasks/packages-cli.yml
similarity index 100%
rename from roles/centos/tasks/packages-cli.yml
rename to roles/el/tasks/packages-cli.yml
diff --git a/roles/centos/tasks/packages-gui.yml b/roles/el/tasks/packages-gui.yml
similarity index 100%
rename from roles/centos/tasks/packages-gui.yml
rename to roles/el/tasks/packages-gui.yml
diff --git a/roles/centos/tasks/solokeys.yml b/roles/el/tasks/solokeys.yml
similarity index 100%
rename from roles/centos/tasks/solokeys.yml
rename to roles/el/tasks/solokeys.yml
diff --git a/roles/centos/tasks/ssh.yml b/roles/el/tasks/ssh.yml
similarity index 100%
rename from roles/centos/tasks/ssh.yml
rename to roles/el/tasks/ssh.yml