add SPHINX_SERVER

diff --git a/config.php-dist b/config.php-dist
index 5366120af6ce94b34676fd2e93a0e83e62b89ca9..9dd46e295f936e549256d980245100d1c4c9a26a 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -108,6 +108,9 @@
        // Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
        // Please see http://tt-rss.org/wiki/SphinxSearch for more information.
 
+       define('SPHINX_SERVER', 'localhost:9312');
+       // Hostname:port combination for the Sphinx server.
+
        define('SPHINX_INDEX', 'ttrss');
        // Index name in Sphinx configuration. You can specify multiple indexes
        // as a comma-separated string.

diff --git a/include/functions.php b/include/functions.php
index 87eb3d6a9d7c585e8f586a473c10db8954b5b4bc..659950be0f327f04be092d6a73f05e2998576b2a 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -3824,7 +3824,9 @@
 
                $sphinxClient = new SphinxClient();
 
-               $sphinxClient->SetServer('localhost', 9312);
+               $sphinxpair = explode(":", SPHINX_SERVER, 2);
+
+               $sphinxClient->SetServer($sphinxpair[0], $sphinxpair[1]);
                $sphinxClient->SetConnectTimeout(1);
 
                $sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,

diff --git a/include/sanity_config.php b/include/sanity_config.php
index 255b404d69432a19dd9f517826905c936f207885..398c979fe976a1d1220fbefb3819ea508c8e740d 100644 (file)
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Tue Apr 16 16:38:38 MSK 2013
+<?php # This file has been generated at:  Tue Apr 16 16:41:13 MSK 2013
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>