From 69f3fe199f50bc8977ad1e01d847d5a413edfc21 Mon Sep 17 00:00:00 2001
From: danielkubat <dan.kubat@gmail.com>
Date: Sat, 12 Dec 2020 01:31:23 +0100
Subject: [PATCH] Ensure SSH daemon is enabled, better wording

---
 ansible/playbooks/handlers/main.yml    |  2 +-
 ansible/playbooks/tasks/ssh_config.yml | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ansible/playbooks/handlers/main.yml b/ansible/playbooks/handlers/main.yml
index 01abf1e..3defd5e 100644
--- a/ansible/playbooks/handlers/main.yml
+++ b/ansible/playbooks/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: restart_ssh
+- name: restart_sshd
   service:
     name: sshd
     state: restarted
diff --git a/ansible/playbooks/tasks/ssh_config.yml b/ansible/playbooks/tasks/ssh_config.yml
index fb06113..6b34484 100644
--- a/ansible/playbooks/tasks/ssh_config.yml
+++ b/ansible/playbooks/tasks/ssh_config.yml
@@ -1,37 +1,42 @@
 ---
-- name: Ensure SSH is installed - it should be
+- name: Ensure SSH server is installed
   package:
     name: openssh-server
     state: present
 
+- name: Ensure SSH daemon is enabled
+  service:
+    name: sshd
+    enabled: true
+
 # TODO: Prepare for /etc/ssh/sshd_config.d/* style of configuration
-- name: ssh configuration - global
+- name: SSH daemon configuration - global
   block:
-    - name: ssh configuration - base
+    - name: SSH daemon configuration - base
       template:
         src: "etc/ssh/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-sshd_config.j2"
-        dest: /etc/ssh/sshd_config
+        dest: "/etc/ssh/sshd_config"
         owner: root
         group: root
         mode: '0600'
         validate: /usr/sbin/sshd -t -f %s
         backup: true
-      notify: restart_ssh
+      notify: restart_sshd
   rescue:
     - name: Print errors for configuration and validation
       debug:
-        msg: "Error in configuration or template"
+        msg: "Error in SSH daemon configuration or template"
 
-- name: ssh banner
+- name: SSH banner
   copy:
     src: "etc/rockybanner"
     dest: "/etc/rockybanner"
     owner: root
     group: root
     mode: '0644'
-  notify: restart_ssh
+  notify: restart_sshd
 
-- name: Remove dsa keys
+- name: Remove DSA keys
   file:
     path: "{{ item }}"
     state: absent