From c56b58149b43d0ea17fd8e034298880ed76842b1 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Fri, 13 Oct 2023 09:43:34 +0200
Subject: [PATCH] Further improvements

---
 core/dovecot/conf/dovecot.conf           |  7 +++++++
 setup/flavors/compose/docker-compose.yml | 15 +++++++++++++++
 towncrier/newsfragments/2971.bugfix      |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index c5173787..0539ac68 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -58,6 +58,7 @@ plugin {
 
   {% if (FULL_TEXT_SEARCH or '').lower() not in ['off', 'false', '0'] %}
   fts = flatcurve
+  fts_index_timeout = 50s
   fts_languages = {% if FULL_TEXT_SEARCH %}{{ FULL_TEXT_SEARCH.split(",") | join(" ") }}{% else %}en{% endif %}
   fts_tokenizers = generic email-address
   fts_autoindex = yes
@@ -82,6 +83,12 @@ plugin {
   {% endif %}
 }
 
+service indexer-worker {
+  executable = /bin/nice -n 10 /usr/libexec/dovecot/indexer-worker
+  # TODO: maybe MAXPROC? I guess it depends on how much RAM is available
+  process_limit = 1
+}
+
 ###############
 # Authentication
 ###############
diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index a81f9f44..65bb242c 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -137,6 +137,10 @@ services:
   oletools:
     image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}oletools:${MAILU_VERSION:-{{ version }}}
     hostname: oletools
+    logging:
+      driver: journald
+      options:
+        tag: mailu-oletools
     restart: always
     networks:
       - noinet
@@ -151,7 +155,12 @@ services:
 {% if tika_enabled %}
   fts_attachments:
     image: apache/tika:2.9.0.0-full
+    # ARM users may want iwishiwasaneagle/apache-tika-arm:2.1.0-full instead
     hostname: tika
+    logging:
+      driver: journald
+      options:
+        tag: mailu-tika
     restart: always
     networks:
       - fts_attachments
@@ -161,6 +170,12 @@ services:
     dns:
       - {{ dns }}
     {% endif %}
+    healthcheck:
+      test: ["CMD-SHELL", "wget -nv -t1 -O /dev/null http://127.0.0.1:9998/tika || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
 {% endif %}
 
   antispam:
diff --git a/towncrier/newsfragments/2971.bugfix b/towncrier/newsfragments/2971.bugfix
index 55d775bb..e247ccbc 100644
--- a/towncrier/newsfragments/2971.bugfix
+++ b/towncrier/newsfragments/2971.bugfix
@@ -9,4 +9,5 @@ find /mailu/mail -type d -name xapian-indexes -prune -exec rm -r {} \+
 
 And proactively force a reindexing using:
 
-docker compose exec imap doveadm index -A '*'
+docker compose exec imap doveadm fts rescan -A
+docker compose exec imap doveadm user '*'|while read u; do docker compose exec imap doveadm index -u $u '*'; done