From 6ee9042d47d7a71c5990272940496ed820fabe81 Mon Sep 17 00:00:00 2001 From: savish Date: Fri, 21 Aug 2020 19:37:47 +0530 Subject: [PATCH] compose: Fix trailing slashes when creating Jitsi video meeting. Tweaked by tabbott to update prod_settings_template.py as well. Fixes #16176. --- zproject/default_settings.py | 2 +- zproject/prod_settings_template.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zproject/default_settings.py b/zproject/default_settings.py index 9714a32fa1..5ef7288aa9 100644 --- a/zproject/default_settings.py +++ b/zproject/default_settings.py @@ -121,7 +121,7 @@ LOCAL_UPLOADS_DIR: Optional[str] = None MAX_FILE_UPLOAD_SIZE = 25 # 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 # development; this is useful since there are no public BigBlueButton servers. diff --git a/zproject/prod_settings_template.py b/zproject/prod_settings_template.py index 7e83fadc6b..d2f26b73b0 100644 --- a/zproject/prod_settings_template.py +++ b/zproject/prod_settings_template.py @@ -654,10 +654,10 @@ CAMO_URI = '/external_content/' #THUMBNAIL_IMAGES = True # 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 # 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 # set big_blue_button_secret in zulip-secrets.conf.