Merge pull request #406 from HeikoAdams/master

[tt-rss.git] / config.php-dist

diff --git a/config.php-dist b/config.php-dist
index 4df299786f422779ec54157744c4bc398b0b174b..0c3e92b74483b2b97b7ae9612e6e61315c0b4e48 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -8,7 +8,7 @@
        define('DB_USER', "fox");
        define('DB_NAME', "fox");
        define('DB_PASS', "XXXXXX");
-       //define('DB_PORT', '5432'); // when neeeded, PG-only
+       define('DB_PORT', ''); // usually 5432 for PostgreSQL, 3306 for MySQL
 
        define('MYSQL_CHARSET', 'UTF8');
        // Connection charset for MySQL. If you have a legacy database and/or experience
@@ -18,9 +18,9 @@
        // *** Basic settings (important!) ***
        // ***********************************
 
-       define('SELF_URL_PATH', 'http://yourserver/tt-rss/');
+       define('SELF_URL_PATH', 'http://example.org/tt-rss/');
        // Full URL of your tt-rss installation. This should be set to the
-       // location of tt-rss directory, e.g. http://yourserver/tt-rss/
+       // location of tt-rss directory, e.g. http://example.org/tt-rss/
        // You need to set this option correctly otherwise several features
        // including PUSH, bookmarklets and browser integration will not work properly.
 
@@ -50,7 +50,11 @@
        // *****************************
 
        define('PHP_EXECUTABLE', '/usr/bin/php');
-       // Path to PHP executable, used for various command-line tt-rss programs
+       // Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss 
+       // programs and update daemon. Do not try to use CGI binary here, it won't work. 
+       // If you see HTTP headers being displayed while running tt-rss scripts, 
+       // then most probably you are using the CGI binary. If you are unsure what to 
+       // put in here, ask your hosting provider.
 
        define('LOCK_DIRECTORY', 'lock');
        // Directory for lockfiles, must be writable to the user you run
@@ -100,20 +104,17 @@
        // Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
        // won't try to subscribe to PUSH feed updates.
 
-       // *********************
-       // *** Sphinx search ***
-       // *********************
-
-       define('SPHINX_ENABLED', false);
-       // Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
-       // Please see http://tt-rss.org/wiki/SphinxSearch for more information.
+       // ****************************
+       // *** Sphinx search plugin ***
+       // ****************************
 
        define('SPHINX_SERVER', 'localhost:9312');
        // Hostname:port combination for the Sphinx server.
 
-       define('SPHINX_INDEX', 'ttrss');
+       define('SPHINX_INDEX', 'ttrss, delta');
        // Index name in Sphinx configuration. You can specify multiple indexes
        // as a comma-separated string.
+       // Example configuration files are available on tt-rss wiki.
 
        // ***********************************
        // *** Self-registrations by users ***
@@ -139,10 +140,6 @@
        define('SESSION_COOKIE_LIFETIME', 86400);
        // Default lifetime of a session (e.g. login) cookie. In seconds, 
        // 0 means cookie will be deleted when browser closes.
-       // Setting this to zero will affect several user preferences
-       // like widescreen mode not saving and disable "remember me".
-       // Note that if remember me is not checked, session cookie
-       // will always expire with browser session.
 
        define('SESSION_CHECK_ADDRESS', 1);
        // Check client IP address when validating session:
@@ -172,6 +169,10 @@
        // These two options enable SMTP authentication when sending
        // outgoing mail. Only used with SMTP_SERVER.
 
+       define('SMTP_SECURE', '');
+       // Used to select a secure SMTP connection. Allowed values: ssl, tls,
+       // or empty.
+       
        // ***************************************
        // *** Other settings (less important) ***
        // ***************************************
@@ -179,6 +180,12 @@
        define('CHECK_FOR_NEW_VERSION', true);
        // Check for new versions of tt-rss automatically.
 
+       define('DETECT_ARTICLE_LANGUAGE', false);
+       // Detect article language when updating feeds, presently this is only
+       // used for hyphenation. This may increase amount of CPU time used by 
+       // update processes, disable if necessary (i.e. you are being billed
+       // for CPU time).
+
        define('ENABLE_GZIP_OUTPUT', false);
        // Selectively gzip output to improve wire performance. This requires
        // PHP Zlib extension on the server.
@@ -192,10 +199,17 @@
        // authentication plugin here (auth_*).
        // Users may enable other user plugins from Preferences/Plugins but may not
        // disable plugins specified in this list.
+       // Disabling auth_internal in this list would automatically disable
+       // reset password link on the login form.
+       
+       define('LOG_DESTINATION', 'sql');
+       // Log destination to use. Possible values: sql (uses internal logging
+       // you can read in Preferences -> System), syslog - logs to system log.
+       // Setting this to blank uses PHP logging (usually to http server 
+       // error.log).
 
        define('CONFIG_VERSION', 26);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).
 
        // vim:ft=php
-?>