Bladeren bron

renaming tags and introducing a common tag

pull/2166/head
Warren Bailey 3 jaren geleden
bovenliggende
commit
215bd1ca6a
3 gewijzigde bestanden met toevoegingen van 9 en 9 verwijderingen
  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 Bestand weergeven

@@ -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.

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
```
[jvb_servers]
[jitsi_jvb_servers]
<your jvb hosts> ansible_host=<ip address of the jvb host>
```



+ 4
- 4
roles/matrix-base/tasks/main.yml Bestand weergeven

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

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

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

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

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


+ 3
- 3
roles/matrix-jitsi/tasks/main.yml Bestand weergeven

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

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

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

Laden…
Annuleren
Opslaan