From 9026c71e48892b02a0bd7b90edead6b7456cbbc4 Mon Sep 17 00:00:00 2001 From: Warren Bailey Date: Tue, 25 Oct 2022 09:37:41 +0100 Subject: [PATCH] reduce the number of services during init of the additional jvb --- roles/matrix-jitsi/tasks/init.yml | 4 ---- roles/matrix-jitsi/tasks/init_additional_jvb.yml | 5 +++++ roles/matrix-jitsi/tasks/init_jitsi.yml | 5 +++++ roles/matrix-jitsi/tasks/main.yml | 9 +++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 roles/matrix-jitsi/tasks/init_additional_jvb.yml create 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 8606c4b3e..e6890c929 100644 --- a/roles/matrix-jitsi/tasks/init.yml +++ b/roles/matrix-jitsi/tasks/init.yml @@ -1,9 +1,5 @@ --- -- 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_additional_jvb.yml b/roles/matrix-jitsi/tasks/init_additional_jvb.yml new file mode 100644 index 000000000..8f229993d --- /dev/null +++ b/roles/matrix-jitsi/tasks/init_additional_jvb.yml @@ -0,0 +1,5 @@ +--- + +- ansible.builtin.set_fact: + matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-jvb.service'] }}" + when: matrix_jitsi_enabled | bool diff --git a/roles/matrix-jitsi/tasks/init_jitsi.yml b/roles/matrix-jitsi/tasks/init_jitsi.yml new file mode 100644 index 000000000..c228478bc --- /dev/null +++ b/roles/matrix-jitsi/tasks/init_jitsi.yml @@ -0,0 +1,5 @@ +--- + +- 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 1e03a9cff..7ac863386 100644 --- a/roles/matrix-jitsi/tasks/main.yml +++ b/roles/matrix-jitsi/tasks/main.yml @@ -4,6 +4,15 @@ 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-jvbi + - ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml" when: "run_setup | bool and matrix_jitsi_enabled | bool" tags: