finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1258 from sakkiii/jitsi-fix

Browse Source 
Jitsi Update (stable-5963 -> stable-6173)
This commit is contained in:
Slavi Pantaleev 2021-08-30 10:41:00 +03:00 committed by GitHub
commit 7fc1a94c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/configuring-playbook-jitsi.md
View File

@ -26,7 +26,6 @@ matrix_jitsi_enabled: true
# Run `bash inventory/scripts/jitsi-generate-passwords.sh` to generate these passwords, # Run `bash inventory/scripts/jitsi-generate-passwords.sh` to generate these passwords,
# or define your own strong passwords manually. # or define your own strong passwords manually.
matrix_jitsi_jicofo_component_secret: ""
matrix_jitsi_jicofo_auth_password: "" matrix_jitsi_jicofo_auth_password: ""
matrix_jitsi_jvb_auth_password: "" matrix_jitsi_jvb_auth_password: ""
matrix_jitsi_jibri_recorder_password: "" matrix_jitsi_jibri_recorder_password: ""

11
roles/matrix-jitsi/defaults/main.yml
View File

@ -7,6 +7,7 @@ matrix_jitsi_enable_guests: false
matrix_jitsi_enable_recording: false matrix_jitsi_enable_recording: false
matrix_jitsi_enable_transcriptions: false matrix_jitsi_enable_transcriptions: false
matrix_jitsi_enable_p2p: true matrix_jitsi_enable_p2p: true
matrix_jitsi_enable_av_moderation: true
# Authentication type, must be one of internal, jwt or ldap. Currently only # Authentication type, must be one of internal, jwt or ldap. Currently only
# internal and ldap are supported by this playbook. # internal and ldap are supported by this playbook.
@ -53,7 +54,7 @@ matrix_jitsi_jibri_recorder_password: ''
matrix_jitsi_enable_lobby: false matrix_jitsi_enable_lobby: false
matrix_jitsi_version: stable-5963 matrix_jitsi_version: stable-6173
matrix_jitsi_container_image_tag: "{{ matrix_jitsi_version }}" # for backward-compatibility matrix_jitsi_container_image_tag: "{{ matrix_jitsi_version }}" # for backward-compatibility
matrix_jitsi_web_docker_image: "{{ matrix_container_global_registry_prefix }}jitsi/web:{{ matrix_jitsi_container_image_tag }}" matrix_jitsi_web_docker_image: "{{ matrix_container_global_registry_prefix }}jitsi/web:{{ matrix_jitsi_container_image_tag }}"
@ -69,6 +70,14 @@ matrix_jitsi_web_public_url: "https://{{ matrix_server_fqn_jitsi }}"
# Addresses need to be prefixed with one of `stun:`, `turn:` or `turns:`. # Addresses need to be prefixed with one of `stun:`, `turn:` or `turns:`.
matrix_jitsi_web_stun_servers: ['stun:meet-jit-si-turnrelay.jitsi.net:443'] matrix_jitsi_web_stun_servers: ['stun:meet-jit-si-turnrelay.jitsi.net:443']
# Setting up TURN
# Default set with Coturn container
matrix_jitsi_turn_credentials: "{{ matrix_coturn_turn_static_auth_secret }}"
matrix_jitsi_turn_host: "turn.{{ matrix_server_fqn_matrix }}"
matrix_jitsi_turns_host: "turn.{{ matrix_server_fqn_matrix }}"
matrix_jitsi_turn_port: "{{ matrix_coturn_container_stun_plain_host_bind_port }}"
matrix_jitsi_turns_port: "{{ matrix_coturn_container_stun_tls_host_bind_port }}"
# Controls whether Etherpad will be available within Jitsi # Controls whether Etherpad will be available within Jitsi
matrix_jitsi_etherpad_enabled: false matrix_jitsi_etherpad_enabled: false

6
roles/matrix-jitsi/templates/prosody/env.j2
View File

@ -2,6 +2,7 @@ AUTH_TYPE={{ matrix_jitsi_auth_type }}
ENABLE_AUTH={{ 1 if matrix_jitsi_enable_auth else 0 }} ENABLE_AUTH={{ 1 if matrix_jitsi_enable_auth else 0 }}
ENABLE_GUESTS={{ 1 if matrix_jitsi_enable_guests else 0 }} ENABLE_GUESTS={{ 1 if matrix_jitsi_enable_guests else 0 }}
ENABLE_LOBBY={{ 1 if matrix_jitsi_enable_lobby else 0 }} ENABLE_LOBBY={{ 1 if matrix_jitsi_enable_lobby else 0 }}
ENABLE_AV_MODERATION={{1 if matrix_jitsi_enable_av_moderation else 0}}
ENABLE_XMPP_WEBSOCKET ENABLE_XMPP_WEBSOCKET
GLOBAL_MODULES GLOBAL_MODULES
GLOBAL_CONFIG GLOBAL_CONFIG
@ -48,4 +49,9 @@ JWT_AUTH_TYPE
JWT_TOKEN_AUTH_MODULE JWT_TOKEN_AUTH_MODULE
LOG_LEVEL LOG_LEVEL
PUBLIC_URL={{ matrix_jitsi_web_public_url }} PUBLIC_URL={{ matrix_jitsi_web_public_url }}
TURN_CREDENTIALS={{ matrix_jitsi_turn_credentials }}
TURN_HOST={{ matrix_jitsi_turn_host }}
TURNS_HOST={{ matrix_jitsi_turns_host }}
TURN_PORT={{ matrix_jitsi_turn_port }}
TURNS_PORT={{ matrix_jitsi_turns_port }}
TZ={{ matrix_jitsi_timezone }} TZ={{ matrix_jitsi_timezone }}