Merge pull request #15156 from overleaf/msm-hotfix-4-1-3

[CE/SP] Hotfix 4.1.3 / 3.5.13

GitOrigin-RevId: 82d8db6164a197a0427f7b9aedd0a440ab2f71b1

server-ce/cron/project-history-retry-soft.sh

@@ -8,4 +8,4 @@ echo "-----------------------------------"
 
 PROJECT_HISTORY_URL='http://localhost:3054'
 
-curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=hard&timeout=3600000&limit=10000"
+curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=soft&timeout=3600000&limit=10000"

server-ce/hotfix/3.5.13/Dockerfile

@@ -0,0 +1,5 @@
+FROM sharelatex/sharelatex:3.5.12
+
+# Patch: fix soft history retry in cron job
+COPY history_soft_retry.patch .
+RUN patch -p0 < history_soft_retry.patch

server-ce/hotfix/3.5.13/history_soft_retry.patch

@@ -0,0 +1,8 @@
+--- cron/project-history-retry-soft.sh
++++ cron/project-history-retry-soft.sh
+@@ -8,4 +8,4 @@ echo "-----------------------------------"
+
+ PROJECT_HISTORY_URL='http://localhost:3054'
+
+-curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=hard&timeout=3600000&limit=10000"
++curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=soft&timeout=3600000&limit=10000"

server-ce/hotfix/4.1.3/Dockerfile

@@ -0,0 +1,5 @@
+FROM sharelatex/sharelatex:4.1.2
+
+# Patch: fix soft history retry in cron job
+COPY history_soft_retry.patch .
+RUN patch -p0 < history_soft_retry.patch

server-ce/hotfix/4.1.3/history_soft_retry.patch

@@ -0,0 +1,8 @@
+--- cron/project-history-retry-soft.sh
++++ cron/project-history-retry-soft.sh
+@@ -8,4 +8,4 @@ echo "-----------------------------------"
+
+ PROJECT_HISTORY_URL='http://localhost:3054'
+
+-curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=hard&timeout=3600000&limit=10000"
++curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=soft&timeout=3600000&limit=10000"