mirror of
https://github.com/bigbluebutton/docker.git
synced 2024-12-26 16:48:49 +01:00
Merge pull request #69 from alangecker/etherpad-refactor
Etherpad refactoring
This commit is contained in:
chandi
GitHub
commit
d54a723665
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -1,3 +1,9 @@
|
||||
[submodule "bbb-webrtc-sfu"]
|
||||
path = bbb-webrtc-sfu
|
||||
url = https://github.com/bigbluebutton/bbb-webrtc-sfu.git
|
||||
[submodule "mod/etherpad/bbb-etherpad-skin"]
|
||||
path = mod/etherpad/bbb-etherpad-skin
|
||||
url = https://github.com/alangecker/bbb-etherpad-skin
|
||||
[submodule "mod/etherpad/bbb-etherpad-plugin"]
|
||||
path = mod/etherpad/bbb-etherpad-plugin
|
||||
url = https://github.com/alangecker/bbb-etherpad-plugin
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
## Unreleased
|
||||
- Applied v2.2.28 changes @alangecker
|
||||
- Etherpad skin & plugin #69 @alangecker
|
||||
- Updated `development.md` docs (example config & note about issue #66) @alangecker
|
||||
- Allow setting the breakout room limit @alangecker
|
||||
|
||||
|
||||
@ -2,20 +2,21 @@ FROM etherpad/etherpad:1.8.6
|
||||
|
||||
USER root
|
||||
|
||||
# install etherpad plugins
|
||||
# - ep_delete_after_delay_lite
|
||||
# - ep_redis_publisher
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y git \
|
||||
&& npm install ep_delete_after_delay_lite git+https://git@github.com/pedrobmarin/ep_redis_publisher.git
|
||||
|
||||
# apply "Including more data at pad update event"
|
||||
# https://github.com/mconf/etherpad-lite/commit/5bc37fc92714e82165386dc0a5dd467609169a87
|
||||
# this is a necessary patch for the closed captions
|
||||
RUN sed -i "s|hooks\.callAll(\"padUpdate\".*)|hooks\.callAll(\"padUpdate\", {'pad':this, 'author': author, 'revs': newRev, 'changeset': aChangeset});|" /opt/etherpad-lite/src/node/db/Pad.js
|
||||
|
||||
COPY settings.json /opt/etherpad-lite/settings.json
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
&& apt-get install -y git
|
||||
|
||||
USER etherpad
|
||||
|
||||
RUN npm install \
|
||||
ep_delete_after_delay_lite \
|
||||
git+https://git@github.com/pedrobmarin/ep_redis_publisher.git
|
||||
|
||||
# add skin from git submodule
|
||||
COPY --chown=etherpad:0 ./bbb-etherpad-skin /opt/etherpad-lite/src/static/skins/bigbluebutton
|
||||
|
||||
# add plugin from git submodule
|
||||
COPY --chown=etherpad:0 ./bbb-etherpad-plugin /opt/etherpad-lite/node_modules/ep_bigbluebutton_patches
|
||||
|
||||
COPY settings.json /opt/etherpad-lite/settings.json
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
1
mod/etherpad/bbb-etherpad-plugin
Submodule
1
mod/etherpad/bbb-etherpad-plugin
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 6c28508afde7c10aeec64403c43bf909cae60c74
|
||||
1
mod/etherpad/bbb-etherpad-skin
Submodule
1
mod/etherpad/bbb-etherpad-skin
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 05ad435b3e935c2563b69bc5b937d1f3fd50fe5a
|
||||
@ -80,7 +80,7 @@
|
||||
* - "colibris": the new experimental skin (since Etherpad 1.8), candidate to
|
||||
* become the default in Etherpad 2.0
|
||||
*/
|
||||
"skinName": "no-skin",
|
||||
"skinName": "bigbluebutton",
|
||||
|
||||
/*
|
||||
* IP and port which etherpad should bind at
|
||||
@ -312,14 +312,26 @@
|
||||
"trustProxy": true,
|
||||
|
||||
/*
|
||||
* When embedding the pads in an iframe set this to true.
|
||||
*/
|
||||
"forceSameSiteNone": false,
|
||||
|
||||
* Settings controlling the session cookie issued by Etherpad.
|
||||
*/
|
||||
"cookie": {
|
||||
/*
|
||||
* Value of the SameSite cookie property. "Lax" is recommended unless
|
||||
* Etherpad will be embedded in an iframe from another site, in which case
|
||||
* this must be set to "None". Note: "None" will not work (the browser will
|
||||
* not send the cookie to Etherpad) unless https is used to access Etherpad
|
||||
* (either directly or via a reverse proxy with "trustProxy" set to true).
|
||||
*
|
||||
* "Strict" is not recommended because it has few security benefits but
|
||||
* significant usability drawbacks vs. "Lax". See
|
||||
* https://stackoverflow.com/q/41841880 for discussion.
|
||||
*/
|
||||
"sameSite": "None"
|
||||
},
|
||||
/*
|
||||
* Privacy: disable IP logging
|
||||
*/
|
||||
"disableIPlogging": false,
|
||||
"disableIPlogging": true,
|
||||
|
||||
/*
|
||||
* Time (in seconds) to automatically reconnect pad when a "Force reconnect"
|
||||
@ -527,6 +539,8 @@
|
||||
*/
|
||||
|
||||
]
|
||||
} // logconfig
|
||||
}, // logconfig
|
||||
/* Override any strings found in locale directories */
|
||||
"customLocaleStrings": {}
|
||||
}
|
||||
|
||||
@ -11,14 +11,8 @@ location /pad/p/ {
|
||||
proxy_set_header X-Forwarded-Proto https; # for EP to set secure cookie flag when https is used
|
||||
proxy_http_version 1.1;
|
||||
|
||||
# there is currently no viable source for building the
|
||||
# bbb-etherpad including sesstiontokens which got introduced in v2.2.21
|
||||
# https://github.com/bigbluebutton/bigbluebutton/issues/10159
|
||||
#
|
||||
# We disable the authentication for now.
|
||||
|
||||
# auth_request /bigbluebutton/connection/checkAuthorization;
|
||||
# auth_request_set $auth_status $upstream_status;
|
||||
auth_request /bigbluebutton/connection/checkAuthorization;
|
||||
auth_request_set $auth_status $upstream_status;
|
||||
}
|
||||
|
||||
location /pad {
|
||||
@ -53,8 +47,8 @@ location /pad/socket.io {
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "Upgrade";
|
||||
|
||||
# auth_request /bigbluebutton/connection/checkAuthorization;
|
||||
# auth_request_set $auth_status $upstream_status;
|
||||
auth_request /bigbluebutton/connection/checkAuthorization;
|
||||
auth_request_set $auth_status $upstream_status;
|
||||
}
|
||||
|
||||
location /static {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user