mirrors/docker-jitsi-meet
1
0
Fork 0
mirror of https://github.com/jitsi/docker-jitsi-meet.git synced 2026-04-03 00:01:07 +02:00
Code Issues Projects Releases Wiki Activity

web: fix Etherpad when using multi-domain

Browse Source 
Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/1242
This commit is contained in:
Дамян Минков 2022-03-22 10:11:06 -05:00 committed by GitHub
parent 0ce0f098cf
commit b0617c0fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/rootfs/defaults/meet.conf
View File

@ -84,14 +84,6 @@ location = /xmpp-websocket {
}
{{ end }}
location ~ ^/([^/?&:'"]+)$ {
try_files $uri @root_path;
}
location @root_path {
rewrite ^/(.*)$ / break;
}
{{ if .Env.ETHERPAD_URL_BASE }}
# Etherpad-lite
location /etherpad/ {
@ -106,6 +98,14 @@ location /etherpad/ {
}
{{ end }}
location ~ ^/([^/?&:'"]+)$ {
try_files $uri @root_path;
}
location @root_path {
rewrite ^/(.*)$ / break;
}
{{ if $ENABLE_SUBDOMAINS }}
location ~ ^/([^/?&:'"]+)/config.js$
{