opendev
/
system-config
Code Issues Proposed changes

Improve meetpad env options for templating 

The PUBLIC_URL is quoted which results in quotes ending up in our config
breaking etherpad base url setting in config.js. We remove the quotes as
they are not necessary.

We also remove the /p/ suffix from ETHERPAD_URL_BASE as this causes the
proxying to send extra /p/s to etherpad which results in problems.

Note these fixes appear to be necessary but are not sufficient to have
working meetpad proxying of etherpad. We also need to fix the nginx
meet.conf proxy settings to send valid Host heads. A followup change
will attempt to address that.

Change-Id: I0f59339a33267468ad5481858507a43cefa0021d
This commit is contained in:
Clark Boylan 2021-03-17 12:47:43 -07:00
parent 7b87c7c305
commit 75a64427a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/jitsi-meet/templates/jvb-env.j2
View File

@ -10,10 +10,10 @@ CONFIG=/var/jitsi-meet
TZ=Etc/UTC TZ=Etc/UTC
# Public URL for the web service. # Public URL for the web service.
PUBLIC_URL="https://meetpad.opendev.org" PUBLIC_URL=https://meetpad.opendev.org
# Set etherpad-lite URL (uncomment to enable). # Set etherpad-lite URL (uncomment to enable).
ETHERPAD_URL_BASE=https://etherpad.opendev.org/p/ ETHERPAD_URL_BASE=https://etherpad.opendev.org
# #
# Basic configuration options # Basic configuration options

4
playbooks/roles/jitsi-meet/templates/meet-env.j2
View File

@ -10,10 +10,10 @@ CONFIG=/var/jitsi-meet
TZ=Etc/UTC TZ=Etc/UTC
# Public URL for the web service. # Public URL for the web service.
PUBLIC_URL="https://meetpad.opendev.org" PUBLIC_URL=https://meetpad.opendev.org
# Set etherpad-lite URL (uncomment to enable). # Set etherpad-lite URL (uncomment to enable).
ETHERPAD_URL_BASE=https://etherpad.opendev.org/p/ ETHERPAD_URL_BASE=https://etherpad.opendev.org
# #
# Basic configuration options # Basic configuration options