bump VERSION_STATIC due to Dojo changes

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

diff --git a/config.php-dist b/config.php-dist
index 0d1bfbc01da0fdacc1af0867f4cfcbe3ec45d29c..c86af943be85da8c1b4be0f3fa75b2a88a0dd4c3 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -25,6 +25,11 @@
        // including PUSH, bookmarklets and browser integration will not work properly.
 
        define('FEED_CRYPT_KEY', '');
+       // WARNING: mcrypt is deprecated in php 7.1. This directive exists for backwards
+       // compatibility with existing installs, new passwords are NOT going to be encrypted.
+       // Use update.php --decrypt-feeds to decrypt existing passwords in the database while
+       // mcrypt is still available.
+
        // Key used for encryption of passwords for password-protected feeds
        // in the database. A string of 24 random characters. If left blank, encryption
        // is not used. Requires mcrypt functions.
@@ -50,10 +55,11 @@
        // *****************************
 
        define('PHP_EXECUTABLE', '/usr/bin/php');
-       // 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.
+       // 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
@@ -103,13 +109,9 @@
        // 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.
@@ -144,13 +146,6 @@
        // Default lifetime of a session (e.g. login) cookie. In seconds, 
        // 0 means cookie will be deleted when browser closes.
 
-       define('SESSION_CHECK_ADDRESS', 1);
-       // Check client IP address when validating session:
-       // 0 - disable checking
-       // 1 - check first 3 octets of an address (recommended)
-       // 2 - check first 2 octets of an address
-       // 3 - check entire address
-
        // *********************************
        // *** Email and digest settings ***
        // *********************************
@@ -173,15 +168,16 @@
        // outgoing mail. Only used with SMTP_SERVER.
 
        define('SMTP_SECURE', '');
-       // used to select a secure SMTP conneciton.  can be tls, ssl or enpty
+       // Used to select a secure SMTP connection. Allowed values: ssl, tls,
+       // or empty.
        
        // ***************************************
        // *** Other settings (less important) ***
        // ***************************************
 
-       define('CHECK_FOR_NEW_VERSION', true);
-       // Check for new versions of tt-rss automatically.
-
+       define('CHECK_FOR_UPDATES', true);
+       // Check for updates automatically if running Git version
+ 
        define('ENABLE_GZIP_OUTPUT', false);
        // Selectively gzip output to improve wire performance. This requires
        // PHP Zlib extension on the server.
@@ -189,7 +185,7 @@
        // if you experience weird errors and tt-rss failing to start, blank pages
        // after login, or content encoding errors, disable it.
 
-       define('PLUGINS', 'auth_internal, note, updater');
+       define('PLUGINS', 'auth_internal, note');
        // Comma-separated list of plugins to load automatically for all users.
        // System plugins have to be specified here. Please enable at least one
        // authentication plugin here (auth_*).
@@ -209,4 +205,3 @@
        // if necessary (after migrating all new options from this file).
 
        // vim:ft=php
-?>