Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix protected recordings #1083

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ RUN apk add --no-cache nginx tini gettext \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log
RUN rm /etc/nginx/http.d/default.conf
COPY --from=bbb-playback /usr/share/bigbluebutton/nginx/ /etc/bigbluebutton/nginx/
COPY --from=bbb-playback /var/bigbluebutton/playback /var/bigbluebutton/playback/
COPY nginx/start /etc/nginx/start
COPY nginx/dhparam.pem /etc/nginx/dhparam.pem
COPY nginx/conf.d /etc/nginx/http.d/
COPY nginx/playback /etc/bigbluebutton/nginx/
EXPOSE 80
EXPOSE 443
ENV NGINX_HOSTNAME=localhost
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/v1/focal260-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ RUN apk add --no-cache nginx tini gettext \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log
RUN rm /etc/nginx/http.d/default.conf
COPY --from=bbb-playback /usr/share/bigbluebutton/nginx/ /etc/bigbluebutton/nginx/
COPY --from=bbb-playback /var/bigbluebutton/playback /var/bigbluebutton/playback/
COPY nginx/start /etc/nginx/start
COPY nginx/dhparam.pem /etc/nginx/dhparam.pem
COPY nginx/conf.d /etc/nginx/http.d/
COPY nginx/playback /etc/bigbluebutton/nginx/
EXPOSE 80
EXPOSE 443
ENV NGINX_HOSTNAME=localhost
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/v1/focal260-amazonlinux
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ RUN yum install yum-utils -y
RUN yum install nginx -y
RUN ln -sf /dev/stdout /var/log/nginx/access.log
RUN ln -sf /dev/stderr /var/log/nginx/error.log
COPY --from=bbb-playback /usr/share/bigbluebutton/nginx/ /etc/bigbluebutton/nginx/
COPY --from=bbb-playback /var/bigbluebutton/playback /var/bigbluebutton/playback/
COPY nginx/start /etc/nginx/start
COPY nginx/dhparam.pem /etc/nginx/dhparam.pem
COPY nginx/conf.d /etc/nginx/http.d/
COPY nginx/playback /etc/bigbluebutton/nginx/
EXPOSE 80
EXPOSE 443
ENV NGINX_HOSTNAME=localhost
Expand Down
4 changes: 4 additions & 0 deletions nginx/playback/playback.nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
location /playback/presentation/2.3 {
root /var/bigbluebutton;
try_files $uri /playback/presentation/2.3/index.html;
}
4 changes: 4 additions & 0 deletions nginx/playback/presentation-video.nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
location ~ "/playback/video/(.*)$" {
return 307 /video/$1;
}

12 changes: 12 additions & 0 deletions nginx/playback/presentation.nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
location /playback/presentation/playback.html {
return 301 /playback/presentation/0.81/playback.html?$query_string;
# If you have recordings from 0.9.0 beta versions and are sure
# that you will never want to play recordings made with
# BigBlueButton 0.81, comment the line above and uncomment the
# following line:
#return 301 /playback/presentation/0.9.0/playback.html?$query_string;
}

location /playback/presentation/2.0/playback.html {
return 301 /playback/presentation/2.3/$arg_meetingId?$query_string;
}
3 changes: 3 additions & 0 deletions nginx/playback/recording-screenshare.nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
location ~ "/recording/screenshare/(.*)$" {
return 307 /screenshare/$1;
}
Loading