From a6f71faf46d5f30c762c35f5f6d16fac293a53e5 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Tue, 13 Aug 2024 16:07:09 +0200 Subject: [PATCH 1/3] github-actions: compacted auto nightly pr --- .github/ISSUE_TEMPLATE/pr_to_nighty_template.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/pr_to_nighty_template.yml b/.github/ISSUE_TEMPLATE/pr_to_nighty_template.yml index 8854ac9de..d9f878584 100644 --- a/.github/ISSUE_TEMPLATE/pr_to_nighty_template.yml +++ b/.github/ISSUE_TEMPLATE/pr_to_nighty_template.yml @@ -1,13 +1,3 @@ -## :memo: Brief description - - - - -## :computer: Commits - - - - ## :file_folder: Modified files - + \ No newline at end of file From e34afd3fdddabb82f4d71bf7e1e554d13ff21497 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Wed, 14 Aug 2024 10:02:59 +0200 Subject: [PATCH 2/3] flatcurve-fts: limit tokenizers for email adresses --- data/Dockerfiles/dovecot/docker-entrypoint.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/Dockerfiles/dovecot/docker-entrypoint.sh b/data/Dockerfiles/dovecot/docker-entrypoint.sh index bd1a44f38..c7564cadd 100755 --- a/data/Dockerfiles/dovecot/docker-entrypoint.sh +++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh @@ -257,10 +257,14 @@ plugin { fts_autoindex_exclude2 = \Trash fts = flatcurve + # Maximum term length can be set via the 'maxlen' argument (maxlen is + # specified in bytes, not number of UTF-8 characters) + fts_tokenizer_email_address = maxlen=100 + fts_tokenizer_generic = algorithm=simple maxlen=30 + # These are not flatcurve settings, but required for Dovecot FTS. See # Dovecot FTS Configuration link above for further information. fts_languages = en es de - fts_tokenizer_generic = algorithm=simple fts_tokenizers = generic email-address # OPTIONAL: Recommended default FTS core configuration From 1994f706c09f7a6d0ff0c8a858e2fa0db9af17dd Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Wed, 14 Aug 2024 10:03:42 +0200 Subject: [PATCH 3/3] dovecot: optimized dockerfile syntax --- data/Dockerfiles/dovecot/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index a832bff6b..4b004cdf1 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -1,12 +1,12 @@ FROM alpine:3.20 -LABEL maintainer = "The Infrastructure Company GmbH " +LABEL maintainer="The Infrastructure Company GmbH " # renovate: datasource=github-releases depName=tianon/gosu versioning=semver-coerced extractVersion=^(?.*)$ ARG GOSU_VERSION=1.16 -ENV LANG C.UTF-8 -ENV LC_ALL C.UTF-8 +ENV LANG=C.UTF-8 +ENV LC_ALL=C.UTF-8 # Add groups and users before installing Dovecot to not break compatibility RUN addgroup -g 5000 vmail \ @@ -133,4 +133,4 @@ COPY repl_health.sh /usr/local/bin/repl_health.sh COPY optimize-fts.sh /usr/local/bin/optimize-fts.sh ENTRYPOINT ["/docker-entrypoint.sh"] -CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]