opendev
/
system-config
Code Issues Proposed changes

Exclude some regex matches in jitsi-meet web 

If we match these explicit paths, don't allow the regex matches to
run.  Otherwise, we might redirect "/http-bind" to "/" which doesn't
work.

Also, restore the default meet.conf to the upstream; we're not
intending to carry any local changes to the rootfs.

Change-Id: I119d8c223291d79bd5fe0977264dec4bae126280
This commit is contained in:
James E. Blair 2020-05-13 07:40:18 -07:00
parent 60b696da09
commit 6a53d47050
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/jitsi-meet/web/rootfs/defaults/meet.conf
View File

@ -6,7 +6,7 @@ root /usr/share/jitsi-meet;
index index.html index index.html
error_page 404 /static/404.html; error_page 404 /static/404.html;
location ~ ^/([a-zA-Z0-9=\?_-]+)$ { location ~ ^/([a-zA-Z0-9=\?]+)$ {
rewrite ^/(.*)$ / break; rewrite ^/(.*)$ / break;
} }

10
playbooks/roles/jitsi-meet/files/meet.conf
View File

@ -10,15 +10,15 @@ location ~ ^/([a-zA-Z0-9=\?_-]+)$ {
rewrite ^/(.*)$ / break; rewrite ^/(.*)$ / break;
} }
location /config.js { location ^~ /config.js {
alias /config/config.js; alias /config/config.js;
} }
location /interface_config.js { location ^~ /interface_config.js {
alias /config/interface_config.js; alias /config/interface_config.js;
} }
location /external_api.js { location ^~ /external_api.js {
alias /usr/share/jitsi-meet/libs/external_api.min.js; alias /usr/share/jitsi-meet/libs/external_api.min.js;
} }
@ -27,14 +27,14 @@ location / {
} }
# BOSH # BOSH
location /http-bind { location ^~ /http-bind {
proxy_pass http://localhost:5280/http-bind; proxy_pass http://localhost:5280/http-bind;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host localhost; proxy_set_header Host localhost;
} }
# Etherpad-lite # Etherpad-lite
location /etherpad/ { location ^~ /etherpad/ {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';