From ae002d8ae4a813b487ce1ea6608f9c8d7d88db4a Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 26 Jul 2020 18:09:29 +0300
Subject: [PATCH] Fix synapse-admin uninstallation

---
 roles/matrix-synapse-admin/tasks/setup.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/matrix-synapse-admin/tasks/setup.yml b/roles/matrix-synapse-admin/tasks/setup.yml
index 1e0cc471..c1f0d240 100644
--- a/roles/matrix-synapse-admin/tasks/setup.yml
+++ b/roles/matrix-synapse-admin/tasks/setup.yml
@@ -12,7 +12,7 @@
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_synapse_admin_docker_image_force_pull }}"
   when: matrix_synapse_admin_enabled|bool
 
-- name: Ensure matrix-matrix-synapse-admin.service installed
+- name: Ensure matrix-synapse-admin.service installed
   template:
     src: "{{ role_path }}/templates/systemd/matrix-synapse-admin.service.j2"
     dest: "{{ matrix_systemd_path }}/matrix-synapse-admin.service"
@@ -20,7 +20,7 @@
   register: matrix_synapse_admin_systemd_service_result
   when: matrix_synapse_admin_enabled|bool
 
-- name: Ensure systemd reloaded after matrix-matrix-synapse-admin.service installation
+- name: Ensure systemd reloaded after matrix-synapse-admin.service installation
   service:
     daemon_reload: yes
   when: "matrix_synapse_admin_enabled|bool and matrix_synapse_admin_systemd_service_result.changed"
@@ -29,26 +29,26 @@
 # Tasks related to getting rid of matrix-synapse-admin (if it was previously enabled)
 #
 
-- name: Check existence of matrix-matrix-synapse-admin service
+- name: Check existence of matrix-synapse-admin service
   stat:
-    path: "{{ matrix_systemd_path }}/matrix-matrix-synapse-admin.service"
+    path: "{{ matrix_systemd_path }}/matrix-synapse-admin.service"
   register: matrix_synapse_admin_service_stat
 
-- name: Ensure matrix-matrix-synapse-admin is stopped
+- name: Ensure matrix-synapse-admin is stopped
   service:
-    name: matrix-matrix-synapse-admin
+    name: matrix-synapse-admin
     state: stopped
     daemon_reload: yes
   register: stopping_result
   when: "not matrix_synapse_admin_enabled|bool and matrix_synapse_admin_service_stat.stat.exists"
 
-- name: Ensure matrix-matrix-synapse-admin.service doesn't exist
+- name: Ensure matrix-synapse-admin.service doesn't exist
   file:
-    path: "{{ matrix_systemd_path }}/matrix-matrix-synapse-admin.service"
+    path: "{{ matrix_systemd_path }}/matrix-synapse-admin.service"
     state: absent
   when: "not matrix_synapse_admin_enabled|bool and matrix_synapse_admin_service_stat.stat.exists"
 
-- name: Ensure systemd reloaded after matrix-matrix-synapse-admin.service removal
+- name: Ensure systemd reloaded after matrix-synapse-admin.service removal
   service:
     daemon_reload: yes
   when: "not matrix_synapse_admin_enabled|bool and matrix_synapse_admin_service_stat.stat.exists"