Refactor playbook to simplify package installs for different OSs

3 files changed, 7 insertions, 16 deletions

diff --git a/roles/ssh/tasks/install-archlinux.yml b/roles/ssh/tasks/install-archlinux.yml
deleted file mode 100644
index b8463c20..00000000
--- a/roles/ssh/tasks/install-archlinux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Ensure sshd installed"
-  become: true
-  community.general.pacman:
-    name: "{{ ssh_package_name }}"
-    state: present
diff --git a/roles/ssh/tasks/install-debian.yml b/roles/ssh/tasks/install-debian.yml
deleted file mode 100644
index e62a4a8c..00000000
--- a/roles/ssh/tasks/install-debian.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Ensure ssh installed"
-  become: true
-  ansible.builtin.apt:
-    name: "{{ ssh_package_name }}"
-    state: "present"
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index c09d00e1..2e26ad7d 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -2,10 +2,13 @@
 - name: "Include OS-specific variables"
   ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml"
 
-- name: "Install OS-specific packages"
-  ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml"
+- name: "Ensure ssh_package_name installed"
+  become: true
+  ansible.builtin.package:
+    name: "{{ ssh_package_name }}"
+    state: "present"
 
-- name: "Ensure ssh_service is enabled"
+- name: "Ensure ssh_service_name is enabled"
   become: true
   ansible.builtin.service:
     name: "{{ ssh_service_name }}"
@@ -13,7 +16,7 @@
     enabled: true
   when: not ansible_is_chroot
 
-- name: "(chroot): Ensure ssh_service enabled"
+- name: "(chroot): Ensure ssh_service_name is enabled"
   # noqa: command-instead-of-module intentional isnide chroot
   ansible.builtin.command:
     cmd: "systemctl enable {{ ssh_service_name }}"