diff --git a/Dockerfile b/Dockerfile index 52628b7d..01af719b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/dockerfiles/v1/focal260-alpine b/dockerfiles/v1/focal260-alpine index ca725712..2730ff91 100644 --- a/dockerfiles/v1/focal260-alpine +++ b/dockerfiles/v1/focal260-alpine @@ -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 diff --git a/dockerfiles/v1/focal260-amazonlinux b/dockerfiles/v1/focal260-amazonlinux index defd72e1..8ee3c408 100644 --- a/dockerfiles/v1/focal260-amazonlinux +++ b/dockerfiles/v1/focal260-amazonlinux @@ -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 diff --git a/nginx/playback/playback.nginx b/nginx/playback/playback.nginx new file mode 100644 index 00000000..18a306ce --- /dev/null +++ b/nginx/playback/playback.nginx @@ -0,0 +1,4 @@ +location /playback/presentation/2.3 { + root /var/bigbluebutton; + try_files $uri /playback/presentation/2.3/index.html; +} diff --git a/nginx/playback/presentation-video.nginx b/nginx/playback/presentation-video.nginx new file mode 100644 index 00000000..f5c26170 --- /dev/null +++ b/nginx/playback/presentation-video.nginx @@ -0,0 +1,4 @@ +location ~ "/playback/video/(.*)$" { + return 307 /video/$1; +} + diff --git a/nginx/playback/presentation.nginx b/nginx/playback/presentation.nginx new file mode 100644 index 00000000..cfdb7f8d --- /dev/null +++ b/nginx/playback/presentation.nginx @@ -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; +} diff --git a/nginx/playback/recording-screenshare.nginx b/nginx/playback/recording-screenshare.nginx new file mode 100644 index 00000000..d4e2416a --- /dev/null +++ b/nginx/playback/recording-screenshare.nginx @@ -0,0 +1,3 @@ +location ~ "/recording/screenshare/(.*)$" { + return 307 /screenshare/$1; +}