extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2025-01-23 14:08:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix and reenable etherpad authorization

Browse Source
This commit is contained in:
chandi 2021-12-13 17:53:06 +01:00
parent 14b0c085fb
commit cb9099fb1e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.tmpl.yml
View File

@ -43,6 +43,7 @@ services:
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- redis - redis
- etherpad
healthcheck: healthcheck:
test: wget --no-proxy --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1 test: wget --no-proxy --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
start_period: 2m start_period: 2m

2
mod/etherpad/bbb-etherpad-plugin

@ -1 +1 @@
Subproject commit dccf33f8e9ced8ee94520535b487f5f76fbe02f2 Subproject commit 068ded573380087e120713d1ccc3c86713ec8c88

8
mod/nginx/bbb/notes.nginx
View File

@ -33,7 +33,7 @@ location /pad/socket.io/socket.io.js {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_buffering off; proxy_buffering off;
} }
location /pad/socket.io { location /pad/socket.io {
rewrite /pad/socket.io/(.*) /socket.io/$1 break; rewrite /pad/socket.io/(.*) /socket.io/$1 break;
proxy_pass http://etherpad:9001/; proxy_pass http://etherpad:9001/;
@ -49,10 +49,8 @@ location /pad/socket.io {
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
# this is currently broken auth_request /bigbluebutton/connection/checkAuthorization;
# TODO: fix & reenable auth_request_set $auth_status $upstream_status;
#auth_request /bigbluebutton/connection/checkAuthorization;
#auth_request_set $auth_status $upstream_status;
} }
location /static { location /static {