From 492f3867d891577d941ca0325ef9d9a4e79bcb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20S=C3=A4nger?= Date: Thu, 10 Jan 2019 12:07:42 +0100 Subject: [PATCH] remove (broken) FTS --- CHANGELOG.md | 1 - core/dovecot/Dockerfile | 2 +- core/dovecot/conf/dovecot.conf | 16 ---------------- docs/compose/.env | 4 ---- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3632f9ff..0458ab5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,6 @@ v1.6.0 - unreleased - Feature: Add posibilty to run webmail on root ([#501](https://github.com/Mailu/Mailu/issues/501)) - Feature: Upgrade docker-compose.yml to version 3 ([#539](https://github.com/Mailu/Mailu/issues/539)) - Feature: Documentation to deploy mailu on a docker swarm ([#551](https://github.com/Mailu/Mailu/issues/551)) -- Feature: Add full-text search support ([#552](https://github.com/Mailu/Mailu/issues/552)) - Feature: Add optional Maildir-Compression ([#553](https://github.com/Mailu/Mailu/issues/553)) - Feature: Preserve rspamd history on container restart ([#561](https://github.com/Mailu/Mailu/issues/561)) - Feature: FAQ ([#564](https://github.com/Mailu/Mailu/issues/564), [#677](https://github.com/Mailu/Mailu/issues/677)) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index dec2b520..83d23b52 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -9,7 +9,7 @@ RUN pip3 install jinja2 RUN pip3 install tenacity # Image specific layers under this line RUN apk add --no-cache \ - dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client bash \ + dovecot dovecot-pigeonhole-plugin rspamd-client bash \ && pip3 install podop \ && mkdir /var/lib/dovecot diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf index 83c78f16..b7cca76c 100644 --- a/core/dovecot/conf/dovecot.conf +++ b/core/dovecot/conf/dovecot.conf @@ -7,22 +7,6 @@ postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }} hostname = {{ HOSTNAMES.split(",")[0] }} submission_host = {{ FRONT_ADDRESS }} -{% if DISABLE_FTS_LUCENE != 'true' %} -############### -# Full-text search -############### -mail_plugins = $mail_plugins fts fts_lucene - -plugin { - fts = lucene - - fts_autoindex = yes - fts_autoindex_exclude = \Junk - - fts_lucene = whitespace_chars=@. -} -{% endif %} - ############### # Mailboxes ############### diff --git a/docs/compose/.env b/docs/compose/.env index f65c2f01..cf906b58 100644 --- a/docs/compose/.env +++ b/docs/compose/.env @@ -3,10 +3,6 @@ # these few settings must however be configured before starting the mail # server and require a restart upon change. -# Set this to `true` to disable full text search by lucene (value: true, false) -# This is a workaround for the bug in issue #751 (indexer-worker crashes) -DISABLE_FTS_LUCENE=false - ################################### # Common configuration variables ###################################