test ssh socket and variants

Signed-off-by: Thomas Sjögren <[email protected]>

Author: konstruktoid

handlers/main.yml

@@ -78,29 +78,34 @@
   when:
     - ansible_facts.virtualization_type not in ["container", "docker", "podman"]
 
-- name: Restart ssh service
+- name: Restart ssh socket
   become: true
   ansible.builtin.service:
-    name: ssh
+    name: "{{ 'ssh.socket' if ansible_facts.os_family == 'Debian' else 'sshd.socket' }}"
     state: restarted
-  register: ssh_service
-  failed_when:
-    - ssh_service is not success
-    - not 'Could not find the requested service' in ssh_service.msg
+    enabled: true
   when:
     - ansible_facts.virtualization_type not in ["container", "docker", "podman"]
+    - ansible_facts.distribution == "Ubuntu"
 
-- name: Restart sshd service
+- name: Restart ssh service
   become: true
   ansible.builtin.service:
-    name: sshd
+    name: "{{ 'ssh.service' if ansible_facts.os_family == 'Debian' else 'sshd.service' }}"
     state: restarted
-  register: sshd_service
-  failed_when:
-    - sshd_service is not success
-    - not 'Could not find the requested service' in sshd_service.msg
+    enabled: true
+  when:
+    - ansible_facts.virtualization_type not in ["container", "docker", "podman"]
+
+- name: Disable ssh service
+  become: true
+  ansible.builtin.service:
+    name: "{{ 'ssh.service' if ansible_facts.os_family == 'Debian' else 'sshd.service' }}"
+    state: stopped
+    enabled: false
   when:
     - ansible_facts.virtualization_type not in ["container", "docker", "podman"]
+    - ansible_facts.distribution == "Ubuntu"
 
 - name: Restart Postfix
   become: true

tasks/sshconfig.yml

@@ -250,7 +250,8 @@
     (not sshd_config_d.stat.exists) or
     (grep_include.rc != 0)
   notify:
-    - Restart sshd service
+    - Disable ssh service
+    - Restart ssh socket
     - Restart ssh service
 
 - name: Configure sshd using sshd_config.d
@@ -268,7 +269,8 @@
     - sshd_config_d.stat.exists
     - grep_include.rc == 0
   notify:
-    - Restart sshd service
+    - Disable ssh service
+    - Restart ssh socket
     - Restart ssh service
 
 - name: Remove possible Subsystem duplicate