From 77052ae4da87823d5049b9525fbe91fd593c2366 Mon Sep 17 00:00:00 2001 From: Michelle Winkler Date: Wed, 4 Dec 2024 15:49:30 +0100 Subject: [PATCH] Fix Notes not working --- data/proxy/bigbluebutton/nginx/notes.nginx | 5 +++ .../bigbluebutton/nginx/playback-video.nginx | 25 ----------- data/proxy/bigbluebutton/nginx/playback.nginx | 4 -- data/proxy/bigbluebutton/nginx/podcast.nginx | 22 --------- .../bigbluebutton/nginx/presentation.nginx | 45 ------------------- .../nginx/recording-screenshare.nginx | 22 --------- docker-compose.yml | 2 +- 7 files changed, 6 insertions(+), 119 deletions(-) create mode 100644 data/proxy/bigbluebutton/nginx/notes.nginx delete mode 100644 data/proxy/bigbluebutton/nginx/playback-video.nginx delete mode 100644 data/proxy/bigbluebutton/nginx/playback.nginx delete mode 100644 data/proxy/bigbluebutton/nginx/podcast.nginx delete mode 100644 data/proxy/bigbluebutton/nginx/presentation.nginx delete mode 100644 data/proxy/bigbluebutton/nginx/recording-screenshare.nginx diff --git a/data/proxy/bigbluebutton/nginx/notes.nginx b/data/proxy/bigbluebutton/nginx/notes.nginx new file mode 100644 index 0000000..3055896 --- /dev/null +++ b/data/proxy/bigbluebutton/nginx/notes.nginx @@ -0,0 +1,5 @@ + location /notes { + root /var/bigbluebutton/published; + index index.html index.htm; + } + diff --git a/data/proxy/bigbluebutton/nginx/playback-video.nginx b/data/proxy/bigbluebutton/nginx/playback-video.nginx deleted file mode 100644 index 3b5283b..0000000 --- a/data/proxy/bigbluebutton/nginx/playback-video.nginx +++ /dev/null @@ -1,25 +0,0 @@ -# This file is part of BigBlueButton. -# -# Copyright © BigBlueButton Inc. and by respective authors. -# -# BigBlueButton is free software: you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by the -# Free Software Foundation, either version 3.0 of the License, or (at your -# option) any later version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with BigBlueButton. If not, see . - -location ~ "/playback/video/(.*)$" { - return 307 /video/$1; -} - -location /video/ { - alias /var/bigbluebutton/published/video/; - index index.html index.htm; -} diff --git a/data/proxy/bigbluebutton/nginx/playback.nginx b/data/proxy/bigbluebutton/nginx/playback.nginx deleted file mode 100644 index 18a306c..0000000 --- a/data/proxy/bigbluebutton/nginx/playback.nginx +++ /dev/null @@ -1,4 +0,0 @@ -location /playback/presentation/2.3 { - root /var/bigbluebutton; - try_files $uri /playback/presentation/2.3/index.html; -} diff --git a/data/proxy/bigbluebutton/nginx/podcast.nginx b/data/proxy/bigbluebutton/nginx/podcast.nginx deleted file mode 100644 index dede93d..0000000 --- a/data/proxy/bigbluebutton/nginx/podcast.nginx +++ /dev/null @@ -1,22 +0,0 @@ -# -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -# -# Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -# -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -# - - location /podcast { - root /var/bigbluebutton/published; - index index.html index.htm; - } diff --git a/data/proxy/bigbluebutton/nginx/presentation.nginx b/data/proxy/bigbluebutton/nginx/presentation.nginx deleted file mode 100644 index 6d396da..0000000 --- a/data/proxy/bigbluebutton/nginx/presentation.nginx +++ /dev/null @@ -1,45 +0,0 @@ -# -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -# -# Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -# -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -# - - 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; - } - - location /playback/presentation { - root /var/bigbluebutton; - index index.html index.htm; - } - - location /presentation { - root /var/bigbluebutton/published; - index index.html index.htm; - } - - location /notes { - root /var/bigbluebutton/published; - index index.html index.htm; - } diff --git a/data/proxy/bigbluebutton/nginx/recording-screenshare.nginx b/data/proxy/bigbluebutton/nginx/recording-screenshare.nginx deleted file mode 100644 index d639110..0000000 --- a/data/proxy/bigbluebutton/nginx/recording-screenshare.nginx +++ /dev/null @@ -1,22 +0,0 @@ -# -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ -# -# Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). -# -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -# - - location /recording/screenshare { - alias /var/bigbluebutton/published/screenshare; - index index.html index.htm; - } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0cf71c7..10df0e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,7 @@ services: restart: unless-stopped volumes: - ./log/recordings/:/var/log/nginx - - ./data/proxy/bigbluebutton/nginx:/etc/bigbluebutton/nginx + - ./data/proxy/bigbluebutton/nginx/notes.nginx:/etc/bigbluebutton/nginx/notes.nginx - ${SCALELITE_RECORDING_DIR:-/mnt/scalelite-recordings/var/bigbluebutton}/published:/var/bigbluebutton/published depends_on: - scalelite-api