From 7aba9ab6dd2827c1e66567b9e8357ca83ef31e23 Mon Sep 17 00:00:00 2001
From: Joe Banks <joe@jb3.dev>
Date: Thu, 18 Jul 2024 00:53:55 +0100
Subject: Separate install stage for Emacs in common role

---
 ansible/roles/common/tasks/main.yml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index 31bf117..5c7feaa 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -8,7 +8,7 @@
   template:
     src: etc-hosts.j2
     dest: /etc/hosts
-    mode: '0644'
+    mode: "0644"
     owner: root
     group: root
   tags:
@@ -35,7 +35,8 @@
     group: root
     mode: "0444"
   notify:
-    - Reload ssh
+    - Reload ssh (Debian)
+    - Reload sshd (Rocky)
   tags:
     - role::common
 
@@ -58,7 +59,7 @@
   file:
     src: /usr/share/zoneinfo/Etc/UTC
     dest: /etc/localtime
-    mode: '0644'
+    mode: "0644"
     owner: root
     group: root
   notify:
@@ -70,7 +71,7 @@
   template:
     src: sudo_lecture.j2
     dest: /etc/sudo_lecture
-    mode: '0644'
+    mode: "0644"
     owner: root
     group: root
   tags:
@@ -82,7 +83,7 @@
     dest: /etc/sudoers.d/pydis
     owner: root
     group: root
-    mode: '0440'
+    mode: "0440"
     validate: /usr/sbin/visudo -cf %s
   tags:
     - role::common
@@ -91,7 +92,7 @@
   template:
     src: motd.j2
     dest: /etc/motd
-    mode: '0644'
+    mode: "0644"
     owner: root
     group: root
   tags:
@@ -102,7 +103,7 @@
     src: /etc/skel/.bashrc
     dest: /root/.bashrc
     remote_src: true
-    mode: '0644'
+    mode: "0644"
     owner: root
     group: root
   tags:
@@ -117,10 +118,19 @@
   tags:
     - role::common
 
-- name: Install larger system administration tools
+- name: Install larger system administration tools (Debian)
   apt:
     name: emacs-nox
     install_recommends: false
     state: present
+  when: ansible_distribution == "Debian"
+  tags:
+    - role::common
+
+- name: Install larger system administration tools (Rocky)
+  package:
+    name: emacs-nox
+    state: present
+  when: ansible_distribution == "Rocky"
   tags:
     - role::common
-- 
cgit v1.2.3