Просмотр исходного кода

Fix Synapse sub-component (worker, S3, ..) uninstallation

matrix-synapse/tasks/setup_uninstall.yml would previously not run unless
Synapse was completely disabled.
pull/2848/head
Slavi Pantaleev 2 лет назад
Родитель
Сommit
cc7244c14d
2 измененных файлов: 6 добавлений и 4 удалений
  1. +2
    -2
      roles/custom/matrix-synapse/tasks/main.yml
  2. +4
    -2
      roles/custom/matrix-synapse/tasks/setup_uninstall.yml

+ 2
- 2
roles/custom/matrix-synapse/tasks/main.yml Просмотреть файл

@@ -36,8 +36,8 @@
- setup-all
- setup-synapse
block:
- when: not matrix_synapse_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
# This always runs because it handles uninstallation for sub-components too.
- ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"

- tags:
- import-synapse-media-store


+ 4
- 2
roles/custom/matrix-synapse/tasks/setup_uninstall.yml Просмотреть файл

@@ -4,7 +4,8 @@
- setup-all
- setup-synapse
block:
- ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/setup_uninstall.yml"
- when: not matrix_synapse_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/setup_uninstall.yml"

- tags:
- setup-all
@@ -17,7 +18,8 @@
- setup-all
- setup-synapse
block:
- ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/setup_uninstall.yml"
- when: not matrix_synapse_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/setup_uninstall.yml"

- tags:
- setup-all


Загрузка…
Отмена
Сохранить