From a26da1869b245fe02b4fbe535ee8cf3a59d8e999 Mon Sep 17 00:00:00 2001 From: uumas Date: Thu, 27 Apr 2023 16:52:47 +0300 Subject: [PATCH] synapse: move worker vars under a subfolder --- roles/synapse/tasks/worker_type.yml | 4 ++-- roles/synapse/vars/{ => workers}/account_persister.yml | 0 roles/synapse/vars/{ => workers}/appservice.yml | 0 roles/synapse/vars/{ => workers}/background_tasks.yml | 0 roles/synapse/vars/{ => workers}/defaults.yml | 0 roles/synapse/vars/{ => workers}/device_persister.yml | 0 roles/synapse/vars/{ => workers}/event_persister.yml | 0 roles/synapse/vars/{ => workers}/federation_sender.yml | 0 roles/synapse/vars/{ => workers}/frontend_proxy.yml | 0 roles/synapse/vars/{ => workers}/generic_federation.yml | 0 roles/synapse/vars/{ => workers}/generic_federation_send.yml | 0 roles/synapse/vars/{ => workers}/media_repository.yml | 0 roles/synapse/vars/{ => workers}/presence_persister.yml | 0 roles/synapse/vars/{ => workers}/pusher.yml | 0 roles/synapse/vars/{ => workers}/receipt_persister.yml | 0 roles/synapse/vars/{ => workers}/typing_persister.yml | 0 16 files changed, 2 insertions(+), 2 deletions(-) rename roles/synapse/vars/{ => workers}/account_persister.yml (100%) rename roles/synapse/vars/{ => workers}/appservice.yml (100%) rename roles/synapse/vars/{ => workers}/background_tasks.yml (100%) rename roles/synapse/vars/{ => workers}/defaults.yml (100%) rename roles/synapse/vars/{ => workers}/device_persister.yml (100%) rename roles/synapse/vars/{ => workers}/event_persister.yml (100%) rename roles/synapse/vars/{ => workers}/federation_sender.yml (100%) rename roles/synapse/vars/{ => workers}/frontend_proxy.yml (100%) rename roles/synapse/vars/{ => workers}/generic_federation.yml (100%) rename roles/synapse/vars/{ => workers}/generic_federation_send.yml (100%) rename roles/synapse/vars/{ => workers}/media_repository.yml (100%) rename roles/synapse/vars/{ => workers}/presence_persister.yml (100%) rename roles/synapse/vars/{ => workers}/pusher.yml (100%) rename roles/synapse/vars/{ => workers}/receipt_persister.yml (100%) rename roles/synapse/vars/{ => workers}/typing_persister.yml (100%) diff --git a/roles/synapse/tasks/worker_type.yml b/roles/synapse/tasks/worker_type.yml index 660629d..283e14b 100644 --- a/roles/synapse/tasks/worker_type.yml +++ b/roles/synapse/tasks/worker_type.yml @@ -5,13 +5,13 @@ worker_type: "{{ synapse_worker.key }}" - name: Include default variables - ansible.builtin.include_vars: defaults.yml + ansible.builtin.include_vars: workers/defaults.yml - name: Include variables for {{ worker_type }} ansible.builtin.include_vars: "{{ item }}" with_first_found: - files: - - "{{ worker_type }}.yml" + - "workers/{{ worker_type }}.yml" skip: true - name: Warn of legacy workers diff --git a/roles/synapse/vars/account_persister.yml b/roles/synapse/vars/workers/account_persister.yml similarity index 100% rename from roles/synapse/vars/account_persister.yml rename to roles/synapse/vars/workers/account_persister.yml diff --git a/roles/synapse/vars/appservice.yml b/roles/synapse/vars/workers/appservice.yml similarity index 100% rename from roles/synapse/vars/appservice.yml rename to roles/synapse/vars/workers/appservice.yml diff --git a/roles/synapse/vars/background_tasks.yml b/roles/synapse/vars/workers/background_tasks.yml similarity index 100% rename from roles/synapse/vars/background_tasks.yml rename to roles/synapse/vars/workers/background_tasks.yml diff --git a/roles/synapse/vars/defaults.yml b/roles/synapse/vars/workers/defaults.yml similarity index 100% rename from roles/synapse/vars/defaults.yml rename to roles/synapse/vars/workers/defaults.yml diff --git a/roles/synapse/vars/device_persister.yml b/roles/synapse/vars/workers/device_persister.yml similarity index 100% rename from roles/synapse/vars/device_persister.yml rename to roles/synapse/vars/workers/device_persister.yml diff --git a/roles/synapse/vars/event_persister.yml b/roles/synapse/vars/workers/event_persister.yml similarity index 100% rename from roles/synapse/vars/event_persister.yml rename to roles/synapse/vars/workers/event_persister.yml diff --git a/roles/synapse/vars/federation_sender.yml b/roles/synapse/vars/workers/federation_sender.yml similarity index 100% rename from roles/synapse/vars/federation_sender.yml rename to roles/synapse/vars/workers/federation_sender.yml diff --git a/roles/synapse/vars/frontend_proxy.yml b/roles/synapse/vars/workers/frontend_proxy.yml similarity index 100% rename from roles/synapse/vars/frontend_proxy.yml rename to roles/synapse/vars/workers/frontend_proxy.yml diff --git a/roles/synapse/vars/generic_federation.yml b/roles/synapse/vars/workers/generic_federation.yml similarity index 100% rename from roles/synapse/vars/generic_federation.yml rename to roles/synapse/vars/workers/generic_federation.yml diff --git a/roles/synapse/vars/generic_federation_send.yml b/roles/synapse/vars/workers/generic_federation_send.yml similarity index 100% rename from roles/synapse/vars/generic_federation_send.yml rename to roles/synapse/vars/workers/generic_federation_send.yml diff --git a/roles/synapse/vars/media_repository.yml b/roles/synapse/vars/workers/media_repository.yml similarity index 100% rename from roles/synapse/vars/media_repository.yml rename to roles/synapse/vars/workers/media_repository.yml diff --git a/roles/synapse/vars/presence_persister.yml b/roles/synapse/vars/workers/presence_persister.yml similarity index 100% rename from roles/synapse/vars/presence_persister.yml rename to roles/synapse/vars/workers/presence_persister.yml diff --git a/roles/synapse/vars/pusher.yml b/roles/synapse/vars/workers/pusher.yml similarity index 100% rename from roles/synapse/vars/pusher.yml rename to roles/synapse/vars/workers/pusher.yml diff --git a/roles/synapse/vars/receipt_persister.yml b/roles/synapse/vars/workers/receipt_persister.yml similarity index 100% rename from roles/synapse/vars/receipt_persister.yml rename to roles/synapse/vars/workers/receipt_persister.yml diff --git a/roles/synapse/vars/typing_persister.yml b/roles/synapse/vars/workers/typing_persister.yml similarity index 100% rename from roles/synapse/vars/typing_persister.yml rename to roles/synapse/vars/workers/typing_persister.yml