opendev/system-config
Code Issues Proposed changes

Upgrade to etherpad 1.9.5

Browse Source 
This bumps etherpad to 1.9.5. The changelog is minimal for this update,
but upstream switches to nodejs 20 by default so we make the same update
here. We also remove TidyHTML configs from our configs to match upstream
updates that did the same thing. Complete release notes can be found
here:

  https://github.com/ether/etherpad-lite/blob/v1.9.5/CHANGELOG.md

We should hold a node and test functionality before merging this change.

Change-Id: Ib6cd888f35624490f630e091f184946e9c4e48aa
This commit is contained in:
Clark Boylan 2023-12-21 09:00:42 -08:00
parent f4a20b0502
commit a0089cfac6
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/etherpad/Dockerfile
View File

@ -22,7 +22,7 @@
#
# Author: muxator
FROM node:18-bookworm-slim
FROM node:20-bookworm-slim
LABEL maintainer="infra-root@openstack.org"
ARG TIMEZONE=
@ -101,7 +101,7 @@ USER etherpad
RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
WORKDIR "${EP_DIR}"
RUN git checkout v1.9.4
RUN git checkout v1.9.5
# Plugins must be installed before installing Etherpad's dependencies, otherwise
# npm will try to hoist common dependencies by removing them from

8
docker/etherpad/settings.json.docker
View File

@ -322,14 +322,6 @@
*/
"soffice": "${SOFFICE:null}",
/*
* Path to the Tidy executable.
*
* Tidy is used to improve the quality of exported pads.
* Setting it to null disables Tidy.
*/
"tidyHtml": "${TIDY_HTML:null}",
/*
* Allow import of file types other than the supported ones:
* txt, doc, docx, rtf, odt, html & htm

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

@ -331,14 +331,6 @@
*/
"soffice": null,
/*
* Path to the Tidy executable.
*
* Tidy is used to improve the quality of exported pads.
* Setting it to null disables Tidy.
*/
"tidyHtml": null,
/*
* Allow import of file types other than the supported ones:
* txt, doc, docx, rtf, odt, html & htm