From b984e4e3b2cbf79d987aaa72100e92e035095ae3 Mon Sep 17 00:00:00 2001
From: Bryan Joshua Pedini <b.pedini@bjphoster.com>
Date: Sat, 25 Jun 2022 22:49:10 +0200
Subject: [PATCH] made personal-linux-config compatible with RHEL environments

---
 personal-linux-config.yml                 | 8 +++++++-
 tasks/debian-general/git.yml              | 1 -
 tasks/debian-general/hostname-package.yml | 6 ++++++
 tasks/general/personal-linux-config.yml   | 6 ------
 tasks/rhel-general/git.yml                | 6 ++++++
 tasks/rhel-general/hostname-package.yml   | 6 ++++++
 6 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 tasks/debian-general/hostname-package.yml
 create mode 100644 tasks/rhel-general/git.yml
 create mode 100644 tasks/rhel-general/hostname-package.yml

diff --git a/personal-linux-config.yml b/personal-linux-config.yml
index 9b720ed..74f99d9 100644
--- a/personal-linux-config.yml
+++ b/personal-linux-config.yml
@@ -4,4 +4,10 @@
   tasks:
     - import_tasks: tasks/debian-general/git.yml
       when: ansible_facts["os_family"] == "Debian"
-    - import_tasks: tasks/general/personal-linux-config.yml
\ No newline at end of file
+    - import_tasks: tasks/debian-general/hostname-package.yml
+      when: ansible_facts["os_family"] == "Debian"
+    - import_tasks: tasks/rhel-general/git.yml
+      when: ansible_facts["os_family"] == "RedHat"
+    - import_tasks: tasks/rhel-general/hostname-package.yml
+      when: ansible_facts["os_family"] == "RedHat"
+    - import_tasks: tasks/general/personal-linux-config.yml
diff --git a/tasks/debian-general/git.yml b/tasks/debian-general/git.yml
index e6a1f97..19c721c 100644
--- a/tasks/debian-general/git.yml
+++ b/tasks/debian-general/git.yml
@@ -2,6 +2,5 @@
 - name: Ensure git is installed and updated
   ansible.builtin.apt:
     update_cache: yes
-    cache_valid_time: 0
     name: git
     state: latest
diff --git a/tasks/debian-general/hostname-package.yml b/tasks/debian-general/hostname-package.yml
new file mode 100644
index 0000000..3efbe49
--- /dev/null
+++ b/tasks/debian-general/hostname-package.yml
@@ -0,0 +1,6 @@
+---
+- name: Ensure the hostname package is installed and updated
+  ansible.builtin.apt:
+    update_cache: yes
+    name: hostname
+    state: latest
diff --git a/tasks/general/personal-linux-config.yml b/tasks/general/personal-linux-config.yml
index 3cf11f5..b059d62 100644
--- a/tasks/general/personal-linux-config.yml
+++ b/tasks/general/personal-linux-config.yml
@@ -1,10 +1,4 @@
 ---
-- name: Ensure the hostname package is installed and updated
-  ansible.builtin.apt:
-    update_cache: yes
-    cache_valid_time: 0
-    name: hostname
-    state: latest
 - name: Ensure the personal-linux-config repositories is updated
   ansible.builtin.git:
     dest: /root/personal-linux-config
diff --git a/tasks/rhel-general/git.yml b/tasks/rhel-general/git.yml
new file mode 100644
index 0000000..5188aaa
--- /dev/null
+++ b/tasks/rhel-general/git.yml
@@ -0,0 +1,6 @@
+---
+- name: Ensure git is installed and updated
+  ansible.builtin.yum:
+    update_cache: yes
+    name: git
+    state: latest
diff --git a/tasks/rhel-general/hostname-package.yml b/tasks/rhel-general/hostname-package.yml
new file mode 100644
index 0000000..c7ac5d8
--- /dev/null
+++ b/tasks/rhel-general/hostname-package.yml
@@ -0,0 +1,6 @@
+---
+- name: Ensure the hostname package is installed and updated
+  ansible.builtin.yum:
+    update_cache: yes
+    name: hostname
+    state: latest