Merge pull request #25021 from overleaf/msm-hotfix-5-4-1

CE/SP Hotfix `5.4.1`

GitOrigin-RevId: f88fb2bef6d096cb46eb0b39652e751056d114ef

server-ce/config/settings.js

@@ -79,6 +79,7 @@ const settings = {
       host: process.env.OVERLEAF_REDIS_HOST || 'dockerhost',
       port: process.env.OVERLEAF_REDIS_PORT || '6379',
       password: process.env.OVERLEAF_REDIS_PASS || undefined,
+      tls: process.env.OVERLEAF_REDIS_TLS === 'true' ? {} : undefined,
       key_schema: {
         // document-updater
         blockingKey({ doc_id }) {

server-ce/hotfix/5.4.1/Dockerfile

@@ -0,0 +1,14 @@
+FROM sharelatex/sharelatex:5.4.0
+
+RUN apt update && apt install -y linux-libc-dev \
+    && unattended-upgrade --verbose --no-minimal-upgrade-steps \
+    && rm -rf /var/lib/apt/lists/*
+COPY package-lock.json.diff .
+RUN patch package-lock.json < package-lock.json.diff
+RUN npm install --omit=dev
+
+
+# fix tls configuration in redis
+COPY issue_24996.patch .
+RUN patch -p0 /etc/overleaf/settings.js < issue_24996.patch \
+    && rm issue_24996.patch

server-ce/hotfix/5.4.1/issue_24996.patch

@@ -0,0 +1,10 @@
+--- settings.js
++++ settings.js
+@@ -79,6 +79,7 @@ const settings = {
+       host: process.env.OVERLEAF_REDIS_HOST || 'dockerhost',
+       port: process.env.OVERLEAF_REDIS_PORT || '6379',
+       password: process.env.OVERLEAF_REDIS_PASS || undefined,
++      tls: process.env.OVERLEAF_REDIS_TLS === 'true' ? {} : undefined,
+       key_schema: {
+         // document-updater
+         blockingKey({ doc_id }) {