Update to 2021-01-29 19:00

master
Daniel Berteaud 4 years ago
parent 9960f28636
commit fe003cf341
  1. 3
      roles/jitsi/tasks/conf.yml
  2. 9
      roles/jitsi/tasks/facts.yml
  3. 1
      roles/jitsi/templates/jicofo/jicofo.conf.j2
  4. 4
      roles/jitsi/templates/prosody.cfg.lua.j2
  5. 4
      roles/prosody/defaults/main.yml

@ -21,6 +21,9 @@
- user: "{{ jitsi_jigasi_xmpp_user }}" - user: "{{ jitsi_jigasi_xmpp_user }}"
pass: "{{ jitsi_jigasi_xmpp_pass }}" pass: "{{ jitsi_jigasi_xmpp_pass }}"
- name: add focus component in focus user roster
command: prosodyctl mod_roster_command subscribe focus.{{ jitsi_domain }} {{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}
when: jitsi_prosody_conf is defined and jitsi_prosody_conf.changed when: jitsi_prosody_conf is defined and jitsi_prosody_conf.changed
tags: jitsi tags: jitsi

@ -13,15 +13,6 @@
when: jitsi_jvb_xmpp_pass is not defined when: jitsi_jvb_xmpp_pass is not defined
tags: jitsi tags: jitsi
- name: Generate a random secret for jicofo
block:
- import_tasks: ../includes/get_rand_pass.yml
vars:
- pass_file: "{{ jitsi_root_dir }}/meta/ansible_jicofo_xmpp_secret"
- set_fact: jitsi_jicofo_xmpp_secret={{ rand_pass }}
when: jitsi_jicofo_xmpp_secret is not defined
tags: jitsi
- name: Generate a random password for the focus account - name: Generate a random password for the focus account
block: block:
- import_tasks: ../includes/get_rand_pass.yml - import_tasks: ../includes/get_rand_pass.yml

@ -3,7 +3,6 @@ JICOFO_HOST={{ jitsi_xmpp_server }}
JICOFO_DOMAIN={{ jitsi_domain }} JICOFO_DOMAIN={{ jitsi_domain }}
JICOFO_USER={{ jitsi_jicofo_xmpp_user }} JICOFO_USER={{ jitsi_jicofo_xmpp_user }}
JICOFO_USERDOMAIN={{ jitsi_auth_domain }} JICOFO_USERDOMAIN={{ jitsi_auth_domain }}
JICOFO_SECRET='{{ jitsi_jicofo_xmpp_secret }}'
JICOFO_USER_PASS='{{ jitsi_jicofo_xmpp_pass }}' JICOFO_USER_PASS='{{ jitsi_jicofo_xmpp_pass }}'
JICOFO_OPTS='' JICOFO_OPTS=''
JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION={{ jitsi_root_dir }}/etc -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo" JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION={{ jitsi_root_dir }}/etc -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo"

@ -86,8 +86,8 @@ Component "internal.{{ jitsi_auth_domain }}" "muc"
modules_enabled = { "ping"; } modules_enabled = { "ping"; }
muc_room_cache_size = 1000 muc_room_cache_size = 1000
Component "focus.{{ jitsi_domain }}" Component "focus.{{ jitsi_domain }}" "client_proxy"
component_secret = "{{ jitsi_jicofo_xmpp_secret }}" target_address = "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}"
Component "speakerstats.{{ jitsi_domain }}" "speakerstats_component" Component "speakerstats.{{ jitsi_domain }}" "speakerstats_component"
muc_component = "conference.{{ jitsi_domain }}" muc_component = "conference.{{ jitsi_domain }}"

@ -31,6 +31,10 @@ prosody_base_modules:
url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_conference_duration.lua url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_conference_duration.lua
- name: mod_conference_duration_component - name: mod_conference_duration_component
url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_conference_duration_component.lua url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_conference_duration_component.lua
- name: mod_client_proxy
url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_client_proxy.lua
- name: mod_roster_command
url: https://raw.githubusercontent.com/jitsi/jitsi-meet/master/resources/prosody-plugins/mod_roster_command.lua
prosody_extra_modules: [] prosody_extra_modules: []
prosody_modules: "{{ (prosody_base_modules + prosody_extra_modules) | unique }}" prosody_modules: "{{ (prosody_base_modules + prosody_extra_modules) | unique }}"

Loading…
Cancel
Save