From b54cfea7680ace604e71e3d149050a314f7d05ba Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Tue, 10 Jan 2017 17:20:04 +0300
Subject: [PATCH] add locales, procps

---
 Dockerfile                   | 2 +-
 etc/sphinxsearch/sphinx.conf | 5 +++--
 home/bugzilla/localconfig    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5cd8ac7..a37d4fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ADD etc/apt/apt.conf /etc/apt/apt.conf
 ADD etc/locale.gen /etc/locale.gen
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" \
-    -o Dpkg::Options::="--force-confold" install -y wget git zip unzip poppler-utils \
+    -o Dpkg::Options::="--force-confold" install -y wget git zip unzip poppler-utils locales procps \
     graphviz patchutils sphinxsearch mc nginx perl mariadb-server libreoffice libdbi-perl libdatetime-perl libemail-address-perl \
     libtemplate-perl libjson-perl libemail-mime-perl libtest-taint-perl \
     libxml-twig-perl libtext-tabulardisplay-perl libemail-sender-perl \
diff --git a/etc/sphinxsearch/sphinx.conf b/etc/sphinxsearch/sphinx.conf
index 4b88fcc..d8333ee 100644
--- a/etc/sphinxsearch/sphinx.conf
+++ b/etc/sphinxsearch/sphinx.conf
@@ -7,8 +7,8 @@ index bugzilla
     rt_field      = short_desc
     rt_field      = comments
     rt_field      = comments_private
-    rt_attr_uint  = id
-    docinfo       = inline
+    # Sphinx 2.2.11 bug #2591 - it refuses to serve indexes without attributes
+    rt_attr_uint  = x
     charset_table = 0..9, A..Z->a..z, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F
     blend_chars   = _, -, &, +, @, $
     morphology    = stem_enru
@@ -30,6 +30,7 @@ searchd
     query_log    = /var/log/sphinxsearch/query.log
     read_timeout = 5
     max_children = 30
+    max_matches  = 100000
     pid_file     = /var/run/sphinxsearch/searchd.pid
     listen       = /var/run/sphinxsearch/searchd.sock:mysql41
     workers      = threads
diff --git a/home/bugzilla/localconfig b/home/bugzilla/localconfig
index 0c0528f..121a661 100644
--- a/home/bugzilla/localconfig
+++ b/home/bugzilla/localconfig
@@ -85,7 +85,7 @@ $sphinx_sock = '/var/run/sphinxsearch/searchd.sock';
 
 # To use MySQL Sphinx Storage Engine (bundled with MariaDB), specify
 # a non-zero port on which Sphinx is listening for non-SphinxQL requests
-$sphinxse_port = 3112;
+$sphinxse_port = 0;
 
 # Should checksetup.pl try to verify that your database setup is correct?
 # (with some combinations of database servers/Perl modules/moonphase this