From b0617c0fe35cdebd5474d8b085d0432c69e708c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=8F=D0=BD=20=D0=9C=D0=B8=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <damencho@jitsi.org>
Date: Tue, 22 Mar 2022 10:11:06 -0500
Subject: [PATCH] web: fix Etherpad when using multi-domain

Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/1242
---
 web/rootfs/defaults/meet.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/rootfs/defaults/meet.conf b/web/rootfs/defaults/meet.conf
index cb84a73..6d8efa6 100644
--- a/web/rootfs/defaults/meet.conf
+++ b/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$
     {