Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compose: Fix trailing slashes when creating Jitsi video meeting. 

Tweaked by tabbott to update prod_settings_template.py as well.

Fixes #16176.
This commit is contained in:
savish 2020-08-21 19:37:47 +05:30 committed by Tim Abbott
parent 55512c030b
commit 6ee9042d47
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zproject/default_settings.py
View File

@ -121,7 +121,7 @@ LOCAL_UPLOADS_DIR: Optional[str] = None
MAX_FILE_UPLOAD_SIZE = 25 MAX_FILE_UPLOAD_SIZE = 25
# Jitsi Meet video call integration; set to None to disable integration. # Jitsi Meet video call integration; set to None to disable integration.
JITSI_SERVER_URL = 'https://meet.jit.si/' JITSI_SERVER_URL = 'https://meet.jit.si'
# Allow setting BigBlueButton settings in zulip-secrets.conf in # Allow setting BigBlueButton settings in zulip-secrets.conf in
# development; this is useful since there are no public BigBlueButton servers. # development; this is useful since there are no public BigBlueButton servers.

4
zproject/prod_settings_template.py
View File

@ -654,10 +654,10 @@ CAMO_URI = '/external_content/'
#THUMBNAIL_IMAGES = True #THUMBNAIL_IMAGES = True
# Controls the Jitsi Meet video call integration. By default, the # Controls the Jitsi Meet video call integration. By default, the
# integration uses the SaaS meet.jit.si server. You can specify # integration uses the SaaS https://meet.jit.si server. You can specify
# your own Jitsi Meet server, or if you'd like to disable the # your own Jitsi Meet server, or if you'd like to disable the
# integration, set JITSI_SERVER_URL = None. # integration, set JITSI_SERVER_URL = None.
#JITSI_SERVER_URL = 'jitsi.example.com' #JITSI_SERVER_URL = 'https://jitsi.example.com'
# Controls the Big Blue Button video call integration. You must also # Controls the Big Blue Button video call integration. You must also
# set big_blue_button_secret in zulip-secrets.conf. # set big_blue_button_secret in zulip-secrets.conf.