From eca5d161c9dff56afd41a5031bfbd168dddb8ec4 Mon Sep 17 00:00:00 2001
From: Yu Changyuan <reivzy@gmail.com>
Date: Sun, 17 Apr 2022 20:47:42 +0800
Subject: [PATCH] web: fix matching etherpad location

To avoid /etherpad/ matched by fallback:
location ~ ^/([^/?&:'"]+)/(.*)$
---
 web/rootfs/defaults/meet.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/rootfs/defaults/meet.conf b/web/rootfs/defaults/meet.conf
index 6d8efa6..df875ad 100644
--- a/web/rootfs/defaults/meet.conf
+++ b/web/rootfs/defaults/meet.conf
@@ -86,7 +86,7 @@ location = /xmpp-websocket {
 
 {{ if .Env.ETHERPAD_URL_BASE }}
 # Etherpad-lite
-location /etherpad/ {
+location ^~ /etherpad/ {
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';