From 414b812a29b35e0bceb45e17fa7450d44d58dc07 Mon Sep 17 00:00:00 2001
From: Marcel Partap <mpartap@gmx.net>
Date: Tue, 1 Dec 2020 22:20:27 +0100
Subject: [PATCH] synapse role workers setup: make configs clean action remote
 compatible

Many people probably didn't even know this - that ansible can be
quite a bit picky about what it will be willing to work with remotely.

Thanks @maxklenk !
---
 roles/matrix-synapse/tasks/workers/setup_install.yml | 12 +++++++++---
 .../matrix-synapse/tasks/workers/setup_uninstall.yml | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/roles/matrix-synapse/tasks/workers/setup_install.yml b/roles/matrix-synapse/tasks/workers/setup_install.yml
index 9aa0c4ec..6cd7ae42 100644
--- a/roles/matrix-synapse/tasks/workers/setup_install.yml
+++ b/roles/matrix-synapse/tasks/workers/setup_install.yml
@@ -46,12 +46,18 @@
     enabled: true
   with_items: "{{ matrix_synapse_workers_enabled_list }}"
 
+- name: Find worker configs to be cleaned
+  find:
+    path: "{{ matrix_synapse_config_dir_path }}"
+    patterns: "worker.*.yaml"
+    use_regex: true
+  register: worker_config_files
+
 - name: Ensure previous worker configs are cleaned
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: absent
-  with_fileglob:
-    - "{{ matrix_synapse_config_dir_path }}/worker.*.yaml"
+  with_items: "{{ worker_config_files.files }}"
 
 - name: Ensure creation of specific worker configs
   template:
diff --git a/roles/matrix-synapse/tasks/workers/setup_uninstall.yml b/roles/matrix-synapse/tasks/workers/setup_uninstall.yml
index 879e6998..a9884fca 100644
--- a/roles/matrix-synapse/tasks/workers/setup_uninstall.yml
+++ b/roles/matrix-synapse/tasks/workers/setup_uninstall.yml
@@ -25,12 +25,18 @@
     state: absent
   register: matrix_synapse_worker_systemd_service_result
 
+- name: Find worker configs to be cleaned
+  find:
+    path: "{{ matrix_synapse_config_dir_path }}"
+    patterns: "worker.*.yaml"
+    use_regex: true
+  register: worker_config_files
+
 - name: Ensure worker configs are cleaned
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: absent
-  with_fileglob:
-    - "{{ matrix_synapse_config_dir_path }}/worker.*.yaml"
+  with_items: "{{ worker_config_files.files }}"
 
 - name: Remove workers from synapse.wants list
   set_fact: