Bladeren bron

web: fix Etherpad when using multi-domain

Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/1242
Дамян Минков 3 jaren geleden
bovenliggende
commit
b0617c0fe3
1 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 8 8
      web/rootfs/defaults/meet.conf

+ 8 - 8
web/rootfs/defaults/meet.conf

@@ -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$
     {