opendev/system-config
Code Issues Proposed changes

Upgrade Etherpad to 1.8.4

Browse Source 
Release notes for 1.8.3 and 1.8.4 mention a number of useful fixes
(there was no 1.8.1 nor 1.8.2). In particular, a workaround was
included for a known source of client-side hangs (some of our broken
"loading..." pads appear to exhibit similar log entries suggesting
this could address that long-standing problem). Unfortunately, in
the breaking changes, it's noted that plugin compatibility may be
impacted so we should test the one plugin we're using to make sure
it's still okay.

We force the skinName setting to no-skin as the default has changed
to colibris in 1.8.3. We don't want colibris, at least not yet, as it
breaks our existing headings plugin.

We also make a small change to the css in the editor so that each line
has its text fully rendered. See https://github.com/ether/etherpad-lite/issues/4106
for more details.

Change-Id: Ieae29a1d0fe28f879abd35b191291357bb5d3f2c
This commit is contained in:
Jeremy Stanley 2020-05-18 20:21:11 +00:00 committed by Clark Boylan
parent 7caf3a6c6d
commit 78781ecfa0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/etherpad/Dockerfile
View File

@ -13,8 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM docker.io/etherpad/etherpad:1.8.0
FROM docker.io/etherpad/etherpad:1.8.4
LABEL maintainer="infra-root@openstack.org"
RUN cd /opt/etherpad-lite && npm install ep_headings
# Install the headings plugin and fix css on 1.8.4.
# Newer etherpad shouldn't need the css fix.
RUN cd /opt/etherpad-lite && npm install ep_headings \
&& sed -i -e 's/padding: 6px 0 !important;/padding: 0 0 !important;/' \
/opt/etherpad-lite/src/static/css/iframe_editor.css

4
playbooks/roles/etherpad/templates/settings.json.j2
View File

@ -29,6 +29,10 @@
"charset" : "utf8mb4",
"database": "etherpad-lite"
},
//force no skin as default has changed to colibris
"skinName": "no-skin",
//the default text of a pad
"defaultPadText" : "Welcome to OpenDev Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nOpenDev: https://opendev.org\nEtherpad on Github: https://github.com/ether/etherpad-lite\n",