external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-20 02:52:11 +00:00
Code Issues Releases Wiki Activity

Cleaning up verbage and spelling.

Browse Source
This commit is contained in:
Jeff Volkenant 2019-05-23 11:06:34 -07:00
parent 85b64c93f9
commit a027b9f467
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
setup/solr.sh
View File

@ -11,9 +11,8 @@
# this didn't make it into the Ubuntu packages, so we use Solr instead to run # this didn't make it into the Ubuntu packages, so we use Solr instead to run
# Lucene for us. # Lucene for us.
# #
# Solr runs as a tomcat process. The dovecot solr plugin talks to solr via its # Solr runs as a Jetty process. The dovecot solr plugin talks to solr via its
# HTTP interface, causing mail to be indexed when searches occur, and getting # HTTP interface, searching indexed mail and returning results back to dovecot.
# results back.
source setup/functions.sh # load our functions source setup/functions.sh # load our functions
source /etc/mailinabox.conf # load global vars source /etc/mailinabox.conf # load global vars
@ -32,7 +31,10 @@ cp /usr/share/dovecot/solr-schema.xml /etc/solr/conf/schema.xml
# Update the dovecot plugin configuration # Update the dovecot plugin configuration
# #
# Break-imap-search makes search work the way users expect, rather than the way # Break-imap-search makes search work the way users expect, rather than the way
# the IMAP specification expects # the IMAP specification expects.
# https://wiki.dovecot.org/Plugins/FTS/Solr
# "break-imap-search : Use Solr also for indexing TEXT and BODY searches.
# This makes your server non-IMAP-compliant."
tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \ tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
mail_plugins="fts fts_solr" mail_plugins="fts fts_solr"
@ -44,7 +46,7 @@ plugin {
} }
EOF EOF
# Install cronjobs to keep FTS up to date # Install cronjobs to keep FTS up to date.
hide_output install -m 755 conf/cronjob/dovecot /etc/cron.daily/ hide_output install -m 755 conf/cronjob/dovecot /etc/cron.daily/
hide_output install -m 644 conf/cronjob/solr /etc/cron.d/ hide_output install -m 644 conf/cronjob/solr /etc/cron.d/
@ -62,24 +64,24 @@ ReadWritePaths=/var/lib/solr/
ReadWritePaths=/var/lib/solr/data/ ReadWritePaths=/var/lib/solr/data/
EOF EOF
# Reload systemctl to pickup the above override # Reload systemctl to pickup the above override.
systemctl daemon-reload systemctl daemon-reload
# Fix Logging # Fix Logging
# Due to the new systemd security permissions placed when running jetty # Due to the new systemd security permissions placed when running jetty.
# the log file directory at /var/log/jetty9 is reset to jetty:jetty # The log file directory at /var/log/jetty9 is reset to jetty:jetty
# at every program start. This causes syslog to fail to add the # at every program start. This causes syslog to fail to add the
# rsyslog filtered output to this folder. We will move this up a # rsyslog filtered output to this folder. We will move this up a
# directory to /var/log/ since solr-jetty is quite noisy. # directory to /var/log/ since solr-jetty is quite noisy.
# Remove package config file since it points to a folder that # Remove package config file since it points to a folder that
# it does not have permissions to, and is also too far down the # it does not have permissions to, and is also too far down the
# /etc/rsyslog.d/ order to work anyway # /etc/rsyslog.d/ order to work anyway.
rm -f /etc/rsyslog.d/jetty9.conf rm -f /etc/rsyslog.d/jetty9.conf
# Create new rsyslog config for jetty9 for its new location # Create new rsyslog config for jetty9 for its new location
cat > /etc/rsyslog.d/10-jetty9.conf <<EOF cat > /etc/rsyslog.d/10-jetty9.conf <<EOF
# Send Jetty messages to jetty.out when using systemd # Send Jetty messages to jetty-console.log when using systemd
:programname, startswith, "jetty9" { :programname, startswith, "jetty9" {
/var/log/jetty-console.log /var/log/jetty-console.log