瀏覽代碼

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 3 年之前
父節點
當前提交
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


Loading…
取消
儲存