etherpad: add skin and additional changes from the fork

.gitmodules

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

mod/etherpad/Dockerfile

@@ -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 \
+    && 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
 
 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"]

mod/etherpad/bbb-etherpad-plugin

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

mod/etherpad/bbb-etherpad-skin

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

mod/etherpad/settings.json

@@ -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": {}
   }