From 1afc3338b10ded82e482cac5e4a0fc7c837310c6 Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Sun, 2 Aug 2026 00:10:15 +0300
Subject: [PATCH] ssh: Ensure ssh enabled, use ssh.service unit on debian

---
 roles/ssh/handlers/main.yaml | 4 ++--
 roles/ssh/tasks/main.yaml    | 7 ++++++-
 roles/ssh/vars/main.yaml     | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 roles/ssh/vars/main.yaml

diff --git a/roles/ssh/handlers/main.yaml b/roles/ssh/handlers/main.yaml
index e8ecd88..2bf21fb 100644
--- a/roles/ssh/handlers/main.yaml
+++ b/roles/ssh/handlers/main.yaml
@@ -1,5 +1,5 @@
 ---
-- name: Restart sshd
+- name: Restart ssh service
   ansible.builtin.systemd_service:
-    name: sshd.service
+    name: "{{ _ssh_service_name }}"
     state: restarted
diff --git a/roles/ssh/tasks/main.yaml b/roles/ssh/tasks/main.yaml
index 396dc36..001f2b6 100644
--- a/roles/ssh/tasks/main.yaml
+++ b/roles/ssh/tasks/main.yaml
@@ -6,8 +6,13 @@
     line: "{{ item.key }} {{ item.value }}"
     state: present
     validate: '/usr/sbin/sshd -t -f %s'
-  notify: Restart sshd
+  notify: Restart ssh service
   with_dict:
     PermitRootLogin: "prohibit-password"
     PasswordAuthentication: "{{ 'yes' if ssh_password_auth else 'no' }}"
     X11Forwarding: "no"
+
+- name: Ensure ssh service is enabled
+  ansible.builtin.systemd_service:
+    name: "{{ _ssh_service_name }}"
+    enabled: true
diff --git a/roles/ssh/vars/main.yaml b/roles/ssh/vars/main.yaml
new file mode 100644
index 0000000..e128c3a
--- /dev/null
+++ b/roles/ssh/vars/main.yaml
@@ -0,0 +1,2 @@
+---
+_ssh_service_name: "{{ 'ssh.service' if ansible_facts.os_family == 'Debian' else 'sshd.service' }}"