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

renaming tags and introducing a common tag

pull/2166/head
Warren Bailey 3 лет назад
Родитель
Сommit
215bd1ca6a
3 измененных файлов: 9 добавлений и 9 удалений
  1. +2
    -2
      docs/configuring-playbook-jitsi.md
  2. +4
    -4
      roles/matrix-base/tasks/main.yml
  3. +3
    -3
      roles/matrix-jitsi/tasks/main.yml

+ 2
- 2
docs/configuring-playbook-jitsi.md Просмотреть файл

@@ -132,11 +132,11 @@ You may want to **limit the maximum video resolution**, to save up resources on
By default a single JVB is deployed on the same hosts as the matrix server. To the scale the JVBs and allow more conferences you may wish to provision additional JVB services on other hosts. By default a single JVB is deployed on the same hosts as the matrix server. To the scale the JVBs and allow more conferences you may wish to provision additional JVB services on other hosts.


There is a ansible role that can be run with the following tag: There is a ansible role that can be run with the following tag:
` ansible-playbook -i inventory/hosts --limit jvb_servers setup.yml --tags=setup-additional-jvb `
` ansible-playbook -i inventory/hosts --limit jitsi_jvb_servers setup.yml --tags=common,setup-additional-jitsi-jvb `


For this role to work you will need an additional section in the ansible hosts file with the details of the JVB hosts, for example For this role to work you will need an additional section in the ansible hosts file with the details of the JVB hosts, for example
``` ```
[jvb_servers]
[jitsi_jvb_servers]
<your jvb hosts> ansible_host=<ip address of the jvb host> <your jvb hosts> ansible_host=<ip address of the jvb host>
``` ```




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

@@ -12,13 +12,13 @@
when: run_setup | bool when: run_setup | bool
tags: tags:
- setup-all - setup-all
- setup-additional-jvb
- common


- ansible.builtin.import_tasks: "{{ role_path }}/tasks/server_base/setup.yml" - ansible.builtin.import_tasks: "{{ role_path }}/tasks/server_base/setup.yml"
when: run_setup | bool when: run_setup | bool
tags: tags:
- setup-all - setup-all
- setup-additional-jvb
- common


# This needs to always run, because it populates `matrix_user_uid` and `matrix_user_gid`, # This needs to always run, because it populates `matrix_user_uid` and `matrix_user_gid`,
# which are required by many other roles. # which are required by many other roles.
@@ -27,13 +27,13 @@
tags: tags:
- always - always
- setup-system-user - setup-system-user
- setup-additional-jvb
- common


- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_matrix_base.yml" - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_matrix_base.yml"
when: run_setup | bool when: run_setup | bool
tags: tags:
- setup-all - setup-all
- setup-additional-jvb
- common


- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_well_known.yml" - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_well_known.yml"
when: run_setup | bool when: run_setup | bool


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

@@ -9,14 +9,14 @@
tags: tags:
- setup-all - setup-all
- setup-jitsi - setup-jitsi
- setup-additional-jvb
- setup-additional-jitsi-jvb


- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_base.yml" - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_base.yml"
when: run_setup | bool when: run_setup | bool
tags: tags:
- setup-all - setup-all
- setup-jitsi - setup-jitsi
- setup-additional-jvb
- setup-additional-jitsi-jvb


- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_web.yml" - ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_jitsi_web.yml"
when: run_setup | bool when: run_setup | bool
@@ -41,4 +41,4 @@
tags: tags:
- setup-all - setup-all
- setup-jitsi - setup-jitsi
- setup-additional-jvb
- setup-additional-jitsi-jvb

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