Mailu · Nebukadneza · Aug 11, 2019 · Aug 11, 2019 · Sep 22, 2019
diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
@@ -12,7 +12,7 @@ RUN pip3 install "podop>0.2.5"
 
 # Image specific layers under this line
 RUN apk add --no-cache \
-  dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \
+  dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin dovecot-fts-solr rspamd-client \
   && mkdir /var/lib/dovecot
 
 COPY conf /conf

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
@@ -7,6 +7,12 @@ postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }}
 hostname = {{ HOSTNAMES.split(",")[0] }}
 submission_host = {{ FRONT_ADDRESS }}
 
+mail_plugins = $mail_plugins fts fts_solr
+plugin {
+  fts = solr
+  fts_solr = url=http://solr:8983/solr/dovecot/
+}
+
 ###############
 # Mailboxes
 ###############

diff --git a/optional/solr/Dockerfile b/optional/solr/Dockerfile
@@ -0,0 +1,24 @@
+FROM alpine:3.10
+# python3 shared with most images
+RUN apk add --no-cache \
+    python3 py3-pip git bash \
+  && pip3 install --upgrade pip
+
+# Image specific layers under this line
+RUN apk add --no-cache bash openjdk11-jre
+COPY start.py /start.py
+
+RUN wget -q -O- http://apache.mirror.digionline.de/lucene/solr/8.2.0/solr-8.2.0.tgz | tar xz -C /tmp
+RUN mv /tmp/solr-8.2.0/ /opt/solr
+RUN adduser -S -D solr
+ADD conf/dovecot/ /opt/solr/server/solr/dovecot/
+ADD conf/coredata /tmp/coredata
+
+RUN chown -R solr /opt/solr
+
+EXPOSE 8983/tcp
+VOLUME /opt/solr/server/solr/dovecot/data
+
+CMD /start.py
+
+HEALTHCHECK --start-period=350s CMD /opt/solr/bin/solr status | grep -q "Found 1 Solr nodes"
diff --git a/optional/solr/conf/coredata/index/segments_1 b/optional/solr/conf/coredata/index/segments_1
diff --git a/optional/solr/conf/coredata/index/write.lock b/optional/solr/conf/coredata/index/write.lock
diff --git a/optional/solr/conf/dovecot/conf/lang/contractions_ca.txt b/optional/solr/conf/dovecot/conf/lang/contractions_ca.txt
@@ -0,0 +1,8 @@
+# Set of Catalan contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+l
+m
+n
+s
+t
diff --git a/optional/solr/conf/dovecot/conf/lang/contractions_fr.txt b/optional/solr/conf/dovecot/conf/lang/contractions_fr.txt
@@ -0,0 +1,15 @@
+# Set of French contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+l
+m
+t
+qu
+n
+s
+j
+d
+c
+jusqu
+quoiqu
+lorsqu
+puisqu
diff --git a/optional/solr/conf/dovecot/conf/lang/contractions_ga.txt b/optional/solr/conf/dovecot/conf/lang/contractions_ga.txt
@@ -0,0 +1,5 @@
+# Set of Irish contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+m
+b
diff --git a/optional/solr/conf/dovecot/conf/lang/contractions_it.txt b/optional/solr/conf/dovecot/conf/lang/contractions_it.txt
@@ -0,0 +1,23 @@
+# Set of Italian contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+c
+l 
+all 
+dall 
+dell 
+nell 
+sull 
+coll 
+pell 
+gl 
+agl 
+dagl 
+degl 
+negl 
+sugl 
+un 
+m 
+t 
+s 
+v 
+d
diff --git a/optional/solr/conf/dovecot/conf/lang/hyphenations_ga.txt b/optional/solr/conf/dovecot/conf/lang/hyphenations_ga.txt
@@ -0,0 +1,5 @@
+# Set of Irish hyphenations for StopFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+h
+n
+t
diff --git a/optional/solr/conf/dovecot/conf/lang/stemdict_nl.txt b/optional/solr/conf/dovecot/conf/lang/stemdict_nl.txt
@@ -0,0 +1,6 @@
+# Set of overrides for the dutch stemmer
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+fiets	fiets
+bromfiets	bromfiets
+ei	eier
+kind	kinder