From fffa6ffb613ec750503fa952f6c47d5b6d68c082 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Thu, 2 May 2019 01:07:52 +0200
Subject: [PATCH] Ajout d'Abiword, pour les imports/export PDF
---
pica-etherpad/Dockerfile | 4 +++-
pica-etherpad/entrypoint.sh | 5 +----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 2ace5a28..53136bc3 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -36,8 +36,10 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
npm install \
ep_align \
ep_author_hover \
+ ep_better_pdf_export \
ep_chatdate \
ep_comments_page \
+ ep_countable \
ep_delete_empty_pads \
ep_font_color \
ep_font_family \
@@ -67,7 +69,7 @@ FROM base
COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh
RUN apt-get update && \
- apt-get install -y mysql-client && \
+ apt-get install -y mysql-client abiword && \
chmod +x /opt/etherpad-lite/entrypoint.sh && \
mkdir -p /opt/etherpad-lite && \
chown -R node /opt/etherpad-lite && \
diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index 08d62e06..d9d27619 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -51,9 +51,6 @@ Prenez des notes et rédigez des documents librement !\n\n \
Pensez à garder l'URL de votre pad pour le retrouver. Attention, celui-ci est public, c'est-à-dire que toute personne possédant l'URL pourra y accéder :\
n'y stockez pas d'informations confidentielles !"}
-# Print table of content by default
-: ${ETHERPAD_TOC:=false}
-
# Check if database already exists
RESULT=`mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} \
-h${MYSQL_PORT_3306_TCP_ADDR} --skip-column-names \
@@ -83,7 +80,7 @@ cat <<- EOF > /opt/etherpad-lite/settings.json
"minify": ${ETHERPAD_MINIFY},
"skinName": "${ETHERPAD_THEME}",
"defaultPadText": "${ETHERPAD_DEFAULT_TEXT}",
- "ep_toc": ${ETHERPAD_TOC},
+ "abiword" : "/usr/bin/abiword",
EOF
if [ $ETHERPAD_ADMIN_PASSWORD ]; then
--
GitLab