From 453a4ec2d859dcb8563f1e637ee167a2387d0158 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 15 Feb 2021 10:42:20 +0200
Subject: [PATCH] Relocate tasks related to Synapse workers

---
 roles/matrix-synapse/tasks/init.yml                           | 2 +-
 roles/matrix-synapse/tasks/setup_synapse.yml                  | 2 +-
 roles/matrix-synapse/tasks/{ => synapse}/workers/setup.yml    | 4 ++--
 .../tasks/{ => synapse}/workers/setup_install.yml             | 2 +-
 .../tasks/{ => synapse}/workers/setup_uninstall.yml           | 0
 .../workers/util/inject_systemd_services_for_worker.yml       | 0
 .../{ => synapse}/workers/util/setup_files_for_worker.yml     | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename roles/matrix-synapse/tasks/{ => synapse}/workers/setup.yml (81%)
 rename roles/matrix-synapse/tasks/{ => synapse}/workers/setup_install.yml (94%)
 rename roles/matrix-synapse/tasks/{ => synapse}/workers/setup_uninstall.yml (100%)
 rename roles/matrix-synapse/tasks/{ => synapse}/workers/util/inject_systemd_services_for_worker.yml (100%)
 rename roles/matrix-synapse/tasks/{ => synapse}/workers/util/setup_files_for_worker.yml (100%)

diff --git a/roles/matrix-synapse/tasks/init.yml b/roles/matrix-synapse/tasks/init.yml
index 46c7d22bd..60eb3f177 100644
--- a/roles/matrix-synapse/tasks/init.yml
+++ b/roles/matrix-synapse/tasks/init.yml
@@ -3,7 +3,7 @@
   when: matrix_synapse_enabled|bool
 
 - name: Ensure systemd services for workers are injected
-  include_tasks: "{{ role_path }}/tasks/workers/util/inject_systemd_services_for_worker.yml"
+  include_tasks: "{{ role_path }}/tasks/synapse/workers/util/inject_systemd_services_for_worker.yml"
   with_items: "{{ matrix_synapse_workers_enabled_list }}"
   loop_control:
     loop_var: matrix_synapse_worker_details
diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index 68d9f5f64..f8bc05a1c 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -18,7 +18,7 @@
 
 - import_tasks: "{{ role_path }}/tasks/ext/setup.yml"
 
-- import_tasks: "{{ role_path }}/tasks/workers/setup.yml"
+- import_tasks: "{{ role_path }}/tasks/synapse/workers/setup.yml"
 
 - import_tasks: "{{ role_path }}/tasks/synapse/setup.yml"
 
diff --git a/roles/matrix-synapse/tasks/workers/setup.yml b/roles/matrix-synapse/tasks/synapse/workers/setup.yml
similarity index 81%
rename from roles/matrix-synapse/tasks/workers/setup.yml
rename to roles/matrix-synapse/tasks/synapse/workers/setup.yml
index 3a7e6c987..ce66a2e40 100644
--- a/roles/matrix-synapse/tasks/workers/setup.yml
+++ b/roles/matrix-synapse/tasks/synapse/workers/setup.yml
@@ -14,8 +14,8 @@
     path: "{{ matrix_local_bin_path }}/matrix-synapse-worker-write-pid"
     state: absent
 
-- include_tasks: "{{ role_path }}/tasks/workers/setup_install.yml"
+- include_tasks: "{{ role_path }}/tasks/synapse/workers/setup_install.yml"
   when: "matrix_synapse_enabled|bool and matrix_synapse_workers_enabled|bool"
 
-- include_tasks: "{{ role_path }}/tasks/workers/setup_uninstall.yml"
+- include_tasks: "{{ role_path }}/tasks/synapse/workers/setup_uninstall.yml"
   when: "not matrix_synapse_workers_enabled|bool"
diff --git a/roles/matrix-synapse/tasks/workers/setup_install.yml b/roles/matrix-synapse/tasks/synapse/workers/setup_install.yml
similarity index 94%
rename from roles/matrix-synapse/tasks/workers/setup_install.yml
rename to roles/matrix-synapse/tasks/synapse/workers/setup_install.yml
index c77bd737a..983f1876f 100644
--- a/roles/matrix-synapse/tasks/workers/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/workers/setup_install.yml
@@ -36,7 +36,7 @@
   with_items: "{{ matrix_synapse_workers_current_systemd_services.files }}"
 
 - name: Ensure creation of worker systemd service files and configuration files
-  include_tasks: "{{ role_path }}/tasks/workers/util/setup_files_for_worker.yml"
+  include_tasks: "{{ role_path }}/tasks/synapse/workers/util/setup_files_for_worker.yml"
   with_items: "{{ matrix_synapse_workers_enabled_list }}"
   loop_control:
     loop_var: matrix_synapse_worker_details
diff --git a/roles/matrix-synapse/tasks/workers/setup_uninstall.yml b/roles/matrix-synapse/tasks/synapse/workers/setup_uninstall.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/workers/setup_uninstall.yml
rename to roles/matrix-synapse/tasks/synapse/workers/setup_uninstall.yml
diff --git a/roles/matrix-synapse/tasks/workers/util/inject_systemd_services_for_worker.yml b/roles/matrix-synapse/tasks/synapse/workers/util/inject_systemd_services_for_worker.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/workers/util/inject_systemd_services_for_worker.yml
rename to roles/matrix-synapse/tasks/synapse/workers/util/inject_systemd_services_for_worker.yml
diff --git a/roles/matrix-synapse/tasks/workers/util/setup_files_for_worker.yml b/roles/matrix-synapse/tasks/synapse/workers/util/setup_files_for_worker.yml
similarity index 100%
rename from roles/matrix-synapse/tasks/workers/util/setup_files_for_worker.yml
rename to roles/matrix-synapse/tasks/synapse/workers/util/setup_files_for_worker.yml