Merge branch 'master' into pr-jitsi-matrix-authentication
This commit is contained in:
		@@ -91,7 +91,7 @@ matrix_jitsi_jibri_recorder_password: ''
 | 
			
		||||
 | 
			
		||||
matrix_jitsi_enable_lobby: false
 | 
			
		||||
 | 
			
		||||
matrix_jitsi_version: stable-8138-1
 | 
			
		||||
matrix_jitsi_version: stable-8252
 | 
			
		||||
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 }}"
 | 
			
		||||
@@ -313,3 +313,8 @@ matrix_jitsi_jvb_container_colibri_ws_host_bind_port: ''
 | 
			
		||||
#
 | 
			
		||||
# The setting requires an integer to be set for usage and allows a user to specify the max number of particpants on a conference.
 | 
			
		||||
matrix_prosody_jitsi_max_participants: ''
 | 
			
		||||
 | 
			
		||||
# Allows abailty to set XMPP AUTH user if using JIGASI
 | 
			
		||||
matrix_jitsi_jigasi_xmpp_user: ''
 | 
			
		||||
# Allows abailty to set XMPP AUTH pasword if using JIGASI
 | 
			
		||||
matrix_jitsi_jigasi_xmpp_password: ''
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user