From 62691e98cfa40bddafee0beb32fd335845190870 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Thu, 2 May 2019 03:57:09 +0200
Subject: [PATCH] Remove always on screen chat - incompatible with new theme
---
pica-etherpad/Dockerfile | 2 +-
pica-etherpad/entrypoint.sh | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 65abc918..b032e607 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -71,7 +71,7 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
FROM base
COPY entrypoint.sh /opt/etherpad-lite/entrypoint.sh
-COPY img/favicon.ico /opt/etherpad-lite/src/static/favicon.ico
+COPY img/favicon.ico /opt/etherpad-lite/src/favicon.ico
RUN apt-get update && \
apt-get install -y mysql-client abiword && \
chmod +x /opt/etherpad-lite/entrypoint.sh && \
diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index f419ff5c..27bedba1 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -92,8 +92,8 @@ cat <<- EOF > /opt/etherpad-lite/settings.json
"padOptions": {
"lang": "fr",
"userName": "Anonyme",
- "alwaysShowChat": true,
- "chatAndUsers": true
+ "alwaysShowChat": false,
+ "chatAndUsers": false
},
"allowUnknownFileEnds": false,
EOF
@@ -116,5 +116,6 @@ cat <<- EOF >> /opt/etherpad-lite/settings.json
}
EOF
+cp /opt/etherpad-lite/favicon.ico /opt/etherpad-lite/src/static/favicon.ico
exec "$@"
--
GitLab