From 6913d368c8a11d61b2de4bb8fbe1adb39c8bb32f Mon Sep 17 00:00:00 2001
From: Jakob S <jakicoll@users.noreply.github.com>
Date: Mon, 6 Feb 2023 12:38:01 +0100
Subject: [PATCH] Consolidate conditionals into a block, keep image

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
---
 .../tasks/setup_uninstall.yml                 | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml b/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
index 2a14d96a..5daafd3d 100644
--- a/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
@@ -5,31 +5,21 @@
     path: "{{ matrix_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
   register: matrix_user_verification_service_service_stat
 
-- name: Ensure matrix-user-verification-service is stopped
-  service:
-    name: "{{ matrix_user_verification_service_systemd_service_basename }}"
-    state: stopped
-    daemon_reload: yes
-  register: stopping_result
-  when: "matrix_user_verification_service_service_stat.stat.exists|bool"
+- when: matrix_user_verification_service_service_stat.stat.exists | bool
+  block:
+    - name: Ensure matrix-user-verification-service is stopped
+      service:
+        name: "{{ matrix_user_verification_service_systemd_service_basename }}"
+        state: stopped
+        daemon_reload: yes
+      register: stopping_result
 
-- name: Ensure matrix-user-verification-service.service doesn't exist
-  file:
-    path: "{{ matrix_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
-    state: absent
-  when: "matrix_user_verification_service_service_stat.stat.exists|bool"
-
-- name: Ensure systemd reloaded after matrix-user-verification-service.service removal
-  service:
-    daemon_reload: yes
-  when: "matrix_user_verification_service_service_stat.stat.exists|bool"
-
-- name: Ensure Matrix user-verification-service paths don't exist
-  file:
-    path: "{{ matrix_user_verification_service_base_path }}"
-    state: absent
+    - name: Ensure matrix-user-verification-service.service doesn't exist
+      file:
+        path: "{{ matrix_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
+        state: absent
 
-- name: Ensure user-verification-service Docker image doesn't exist
-  docker_image:
-    name: "{{ matrix_user_verification_service_docker_image }}"
-    state: absent
+    - name: Ensure Matrix user-verification-service paths don't exist
+      file:
+        path: "{{ matrix_user_verification_service_base_path }}"
+        state: absent