From 7830a1629bd6863f4ea6081eb9b9878f2cbdc3f1 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 23 Apr 2022 23:29:05 +0300
Subject: [PATCH] Debian server role: Some small fixes.

- Apply tagging to all included tasks.
- Restart the Docker service after updating the container restart
  drop-in, in case there are containers in need of a restart.
- Reload Systemd after updating the btrfs scrub and check units, simple
  omission.
---
 Ansible/roles/debian_server/tasks/btrfs.yml  | 4 ++++
 Ansible/roles/debian_server/tasks/docker.yml | 1 +
 Ansible/roles/debian_server/tasks/main.yml   | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/Ansible/roles/debian_server/tasks/btrfs.yml b/Ansible/roles/debian_server/tasks/btrfs.yml
index 2b782ee..7091069 100644
--- a/Ansible/roles/debian_server/tasks/btrfs.yml
+++ b/Ansible/roles/debian_server/tasks/btrfs.yml
@@ -30,6 +30,8 @@
       {{ (ansible_facts.mounts|selectattr("device", "equalto", device)|first)["mount"] }}
     # yamllint enable rule:line-length
   tags: [scrub]
+  notify:
+    - Systemd daemon reload
 
 - name: Enable btrfs scrub timers
   ansible.builtin.systemd:
@@ -46,6 +48,8 @@
     mode: 0o0644
     src: btrfs_check.{{ item }}.j2
   vars: *vars
+  notify:
+    - Systemd daemon reload
 
 - name: Enable the btrfs check timers
   ansible.builtin.systemd:
diff --git a/Ansible/roles/debian_server/tasks/docker.yml b/Ansible/roles/debian_server/tasks/docker.yml
index ca4a381..f5d5e8f 100644
--- a/Ansible/roles/debian_server/tasks/docker.yml
+++ b/Ansible/roles/debian_server/tasks/docker.yml
@@ -37,6 +37,7 @@
     mode: 0o0644
   notify:
     - Systemd daemon reload
+    - Restart Docker
 
 - name: Allow access from the toolbox container
   ansible.builtin.copy:
diff --git a/Ansible/roles/debian_server/tasks/main.yml b/Ansible/roles/debian_server/tasks/main.yml
index 665a816..447d9e6 100644
--- a/Ansible/roles/debian_server/tasks/main.yml
+++ b/Ansible/roles/debian_server/tasks/main.yml
@@ -100,12 +100,18 @@
 - name: Include Docker tasks
   ansible.builtin.include_tasks:
     file: docker.yml
+    apply:
+      tags:
+        - docker
   tags:
     - always
 
 - name: Include web tasks
   ansible.builtin.include_tasks:
     file: web.yml
+    apply:
+      tags:
+        - web
   tags:
     - always
 
-- 
GitLab