From 53da579e6037f597ea45a3aaa96a5dcd6aa7ccbd Mon Sep 17 00:00:00 2001 From: Warren Bailey Date: Tue, 25 Oct 2022 10:05:53 +0100 Subject: [PATCH] revert change to jitsi init as it's needed --- roles/matrix-jitsi/tasks/init.yml | 4 ++++ roles/matrix-jitsi/tasks/init_jitsi.yml | 5 ----- roles/matrix-jitsi/tasks/main.yml | 5 ----- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 roles/matrix-jitsi/tasks/init_jitsi.yml diff --git a/roles/matrix-jitsi/tasks/init.yml b/roles/matrix-jitsi/tasks/init.yml index e6890c929..8606c4b3e 100644 --- a/roles/matrix-jitsi/tasks/init.yml +++ b/roles/matrix-jitsi/tasks/init.yml @@ -1,5 +1,9 @@ --- +- ansible.builtin.set_fact: + matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web.service', 'matrix-jitsi-prosody.service', 'matrix-jitsi-jicofo.service', 'matrix-jitsi-jvb.service'] }}" + when: matrix_jitsi_enabled | bool + - name: Fail if on an unsupported architecture ansible.builtin.fail: msg: "Jitsi only supports the amd64 architecture right now. See https://github.com/jitsi/docker-jitsi-meet/issues/1069 and https://github.com/jitsi/docker-jitsi-meet/issues/1214" diff --git a/roles/matrix-jitsi/tasks/init_jitsi.yml b/roles/matrix-jitsi/tasks/init_jitsi.yml deleted file mode 100644 index c228478bc..000000000 --- a/roles/matrix-jitsi/tasks/init_jitsi.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -- ansible.builtin.set_fact: - matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web.service', 'matrix-jitsi-prosody.service', 'matrix-jitsi-jicofo.service', 'matrix-jitsi-jvb.service'] }}" - when: matrix_jitsi_enabled | bool diff --git a/roles/matrix-jitsi/tasks/main.yml b/roles/matrix-jitsi/tasks/main.yml index df5925858..be96d944d 100644 --- a/roles/matrix-jitsi/tasks/main.yml +++ b/roles/matrix-jitsi/tasks/main.yml @@ -4,11 +4,6 @@ tags: - always -- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init_jitsi.yml" - tags: - - setup-all - - setup-jitsi - - ansible.builtin.import_tasks: "{{ role_path }}/tasks/init_additional_jvb.yml" tags: - setup-additional-jitsi-jvb