extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2024-11-22 08:03:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

etherpad: add skin and additional changes from the fork

Browse Source
This commit is contained in:
chandi 2020-10-21 19:26:01 +02:00
parent 1c4dbe2f98
commit 286a89a9cc
5 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -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

23
mod/etherpad/Dockerfile
View File

@ -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
&& apt-get install -y 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
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
USER etherpad
ENTRYPOINT ["/entrypoint.sh"]

1
mod/etherpad/bbb-etherpad-plugin Submodule

@ -0,0 +1 @@
Subproject commit 6c28508afde7c10aeec64403c43bf909cae60c74

1
mod/etherpad/bbb-etherpad-skin Submodule

@ -0,0 +1 @@
Subproject commit 05ad435b3e935c2563b69bc5b937d1f3fd50fe5a

26
mod/etherpad/settings.json
View File

@ -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.
* Settings controlling the session cookie issued by Etherpad.
*/
"forceSameSiteNone": false,
"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": {}
}