From 75a64427a150c5db8f4815fea17893bb33b5d776 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 17 Mar 2021 12:47:43 -0700 Subject: [PATCH] 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 --- playbooks/roles/jitsi-meet/templates/jvb-env.j2 | 4 ++-- playbooks/roles/jitsi-meet/templates/meet-env.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/roles/jitsi-meet/templates/jvb-env.j2 b/playbooks/roles/jitsi-meet/templates/jvb-env.j2 index 5752cc09b1..aebecdeb1d 100644 --- a/playbooks/roles/jitsi-meet/templates/jvb-env.j2 +++ b/playbooks/roles/jitsi-meet/templates/jvb-env.j2 @@ -10,10 +10,10 @@ CONFIG=/var/jitsi-meet TZ=Etc/UTC # 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). -ETHERPAD_URL_BASE=https://etherpad.opendev.org/p/ +ETHERPAD_URL_BASE=https://etherpad.opendev.org # # Basic configuration options diff --git a/playbooks/roles/jitsi-meet/templates/meet-env.j2 b/playbooks/roles/jitsi-meet/templates/meet-env.j2 index ca7cdfcb5b..4ccc6bfff5 100644 --- a/playbooks/roles/jitsi-meet/templates/meet-env.j2 +++ b/playbooks/roles/jitsi-meet/templates/meet-env.j2 @@ -10,10 +10,10 @@ CONFIG=/var/jitsi-meet TZ=Etc/UTC # 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). -ETHERPAD_URL_BASE=https://etherpad.opendev.org/p/ +ETHERPAD_URL_BASE=https://etherpad.opendev.org # # Basic configuration options