opendev/system-config
Code Issues Proposed changes

Merge "Upgrade to etherpad 1.9.5"

Browse Source
This commit is contained in:
Zuul 2024-01-04 06:55:08 +00:00 committed by Gerrit Code Review
commit cd74ebc2bf
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 # Author: muxator
FROM node:18-bookworm-slim FROM node:20-bookworm-slim
LABEL maintainer="infra-root@openstack.org" LABEL maintainer="infra-root@openstack.org"
ARG TIMEZONE= ARG TIMEZONE=
@ -101,7 +101,7 @@ USER etherpad
RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR} RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
WORKDIR "${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 # Plugins must be installed before installing Etherpad's dependencies, otherwise
# npm will try to hoist common dependencies by removing them from # 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}", "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: * Allow import of file types other than the supported ones:
* txt, doc, docx, rtf, odt, html & htm * txt, doc, docx, rtf, odt, html & htm

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

@ -331,14 +331,6 @@
*/ */
"soffice": null, "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: * Allow import of file types other than the supported ones:
* txt, doc, docx, rtf, odt, html & htm * txt, doc, docx, rtf, odt, html & htm