From a48ac235202563b6aa525c629dd03f466087d20e Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 8 May 2020 16:01:01 +0000
Subject: [PATCH] Support hyphens and underscores for meetpad rooms
Many people put hyphens (-) and underscores (_) in their pad names,
and Jitsi-Meet seems to support them in its room names too, so add
them to our rewrite regex.
Change-Id: I819b8d56bf839cf743319e9cd823440c7d910001
---
docker/jitsi-meet/web/rootfs/defaults/meet.conf | 2 +-
playbooks/roles/jitsi-meet/files/meet.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/jitsi-meet/web/rootfs/defaults/meet.conf b/docker/jitsi-meet/web/rootfs/defaults/meet.conf
index c8331ed9e4..14663dcfd8 100644
--- a/docker/jitsi-meet/web/rootfs/defaults/meet.conf
+++ b/docker/jitsi-meet/web/rootfs/defaults/meet.conf
@@ -6,7 +6,7 @@ root /usr/share/jitsi-meet;
index index.html
error_page 404 /static/404.html;
-location ~ ^/([a-zA-Z0-9=\?]+)$ {
+location ~ ^/([a-zA-Z0-9=\?_-]+)$ {
rewrite ^/(.*)$ / break;
}
diff --git a/playbooks/roles/jitsi-meet/files/meet.conf b/playbooks/roles/jitsi-meet/files/meet.conf
index b7061c6cdd..2b8eb4395a 100644
--- a/playbooks/roles/jitsi-meet/files/meet.conf
+++ b/playbooks/roles/jitsi-meet/files/meet.conf
@@ -6,7 +6,7 @@ root /usr/share/jitsi-meet;
index index.html
error_page 404 /static/404.html;
-location ~ ^/([a-zA-Z0-9=\?]+)$ {
+location ~ ^/([a-zA-Z0-9=\?_-]+)$ {
rewrite ^/(.*)$ / break;
}