Merge branch 'master' into admin-login

2019-03-10 10:38:42 +01:00
parent 5754c6e2aa a70663d64e
commit ae19d81f2d
10 changed files with 374 additions and 379 deletions
--- a/data/conf/dovecot/dovecot.conf
+++ b/data/conf/dovecot/dovecot.conf
@@ -308,7 +308,7 @@ plugin {
  acl = vfile
  fts = solr
  fts_autoindex = yes
-  fts_solr = url=http://solr:8983/solr/dovecot/
+  fts_solr = url=http://solr:8983/solr/dovecot-fts/
  quota = dict:Userquota::proxy::sqlquota
  quota_rule2 = Trash:storage=+100%%
  sieve = /var/vmail/sieve/%u.sieve