web: fix Etherpad when using multi-domain

Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/1242
pull/1257/head
Дамян Минков 3 years ago committed by GitHub
parent 0ce0f098cf
commit b0617c0fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      web/rootfs/defaults/meet.conf

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

Loading…
Cancel
Save