From ec5e6d3dffc64e8db260255f6a1578c2fc8d50db Mon Sep 17 00:00:00 2001
From: Tyler Hale <tyler@haletek.com>
Date: Mon, 22 Aug 2022 14:28:58 -0600
Subject: [PATCH] Cleaning up templates for dnf-automatic

---
 roles/base/defaults/main.yml                        |  3 +++
 roles/base/tasks/redhat_automatic_updates.yml       | 13 +++++++++++--
 .../templates/dnf-automatic-install.service-8.j2    |  2 --
 .../templates/dnf-automatic-install.service-9.j2    |  2 --
 ...e-36.j2 => dnf-automatic-install.service-dnf.j2} |  0
 ...ce-7.j2 => dnf-automatic-install.service-yum.j2} |  0
 roles/base/templates/dnf-automatic-install.timer.j2 |  4 ++--
 7 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 roles/base/templates/dnf-automatic-install.service-8.j2
 delete mode 100644 roles/base/templates/dnf-automatic-install.service-9.j2
 rename roles/base/templates/{dnf-automatic-install.service-36.j2 => dnf-automatic-install.service-dnf.j2} (100%)
 rename roles/base/templates/{dnf-automatic-install.service-7.j2 => dnf-automatic-install.service-yum.j2} (100%)

diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index e914d22..d2b9f04 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -102,6 +102,9 @@ base_redhat_epel: true
 # DNF Automatic
 # =============
 
+base_redhat_dnf_automatic_timer: "02:00"
+base_redhat_dnf_automatic_timer_randomizer: "5m"
+
 # commands
 # --------
 
diff --git a/roles/base/tasks/redhat_automatic_updates.yml b/roles/base/tasks/redhat_automatic_updates.yml
index ee25897..9a3b5b5 100644
--- a/roles/base/tasks/redhat_automatic_updates.yml
+++ b/roles/base/tasks/redhat_automatic_updates.yml
@@ -42,9 +42,18 @@
     recurse: yes
     state: directory
 
-- name: Deploy dnf-automatic install service override
+- name: Deploy dnf-automatic install service override (YUM versions)
   template:
-    src: "dnf-automatic-install.service-{{ ansible_distribution_major_version }}.j2"
+    src: "dnf-automatic-install.service-yum.j2"
     dest: /etc/systemd/system/dnf-automatic-install.service.d/override.conf
   become: true
   notify: Daemon Reload
+  when: ansible_distribution_major_version == 7
+
+- name: Deploy dnf-automatic install service override (DNF versions)
+  template:
+    src: "dnf-automatic-install.service-dnf.j2"
+    dest: /etc/systemd/system/dnf-automatic-install.service.d/override.conf
+  become: true
+  notify: Daemon Reload
+  when: ansible_distribution_major_version != 7
diff --git a/roles/base/templates/dnf-automatic-install.service-8.j2 b/roles/base/templates/dnf-automatic-install.service-8.j2
deleted file mode 100644
index 58b55d1..0000000
--- a/roles/base/templates/dnf-automatic-install.service-8.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-ExecStartPost=/bin/sh -ec 'dnf needs-restarting -r | grep -q "Reboot is req.*" && shutdown -r +5 Rebooting after applying package updates || exit 0'
diff --git a/roles/base/templates/dnf-automatic-install.service-9.j2 b/roles/base/templates/dnf-automatic-install.service-9.j2
deleted file mode 100644
index 58b55d1..0000000
--- a/roles/base/templates/dnf-automatic-install.service-9.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-ExecStartPost=/bin/sh -ec 'dnf needs-restarting -r | grep -q "Reboot is req.*" && shutdown -r +5 Rebooting after applying package updates || exit 0'
diff --git a/roles/base/templates/dnf-automatic-install.service-36.j2 b/roles/base/templates/dnf-automatic-install.service-dnf.j2
similarity index 100%
rename from roles/base/templates/dnf-automatic-install.service-36.j2
rename to roles/base/templates/dnf-automatic-install.service-dnf.j2
diff --git a/roles/base/templates/dnf-automatic-install.service-7.j2 b/roles/base/templates/dnf-automatic-install.service-yum.j2
similarity index 100%
rename from roles/base/templates/dnf-automatic-install.service-7.j2
rename to roles/base/templates/dnf-automatic-install.service-yum.j2
diff --git a/roles/base/templates/dnf-automatic-install.timer.j2 b/roles/base/templates/dnf-automatic-install.timer.j2
index 2fb9629..2b0564b 100644
--- a/roles/base/templates/dnf-automatic-install.timer.j2
+++ b/roles/base/templates/dnf-automatic-install.timer.j2
@@ -1,5 +1,5 @@
 [Timer]
 OnBootSec=
-OnCalendar= 2:00
-RandomizedDelaySec=5m
+OnCalendar={{ base_redhat_dnf_automatic_timer }}
+RandomizedDelaySec={{ base_redhat_dnf_automatic_timer_randomizer }}
 AccuracySec=1s