Merge branch 'master' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx...

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

diff --git a/config.php-dist b/config.php-dist
index 4df299786f422779ec54157744c4bc398b0b174b..1fdec26e4f5ddc2396bd0c2e87f68fc97214bd04 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
@@ -50,7 +50,10 @@
        // *****************************
 
        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
@@ -111,9 +114,10 @@
        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 +143,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 +172,9 @@
        // These two options enable SMTP authentication when sending
        // outgoing mail. Only used with SMTP_SERVER.
 
+       define('SMTP_SECURE', '');
+       // used to select a secure SMTP conneciton.  can be tls, ssl or enpty
+       
        // ***************************************
        // *** Other settings (less important) ***
        // ***************************************
@@ -192,6 +195,14 @@
        // 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