rework login process, drop http auth

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

diff --git a/config.php-dist b/config.php-dist
index a50a51c4db2e6ccaf92aea2ec8c524bdc1f7d7de..bbf45869a175c6f36a8fc946f25178bbc0656e71 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -9,15 +9,15 @@
        define('DB_PASS', "XXXXXX");
        //define('DB_PORT', '5432'); // when neeeded, PG-only
 
-       define('RSS_BACKEND_TYPE', "magpie");
-       // magpie (stable) or simplepie (EXPERIMENTAL!)
+       define('MAGPIE_FETCH_TIME_OUT', 60);
+       // Magpie's default timeout is 5 seconds.  Some RSS feeds,
+       // such as from large Trac installs, can take significantly
+       // longer than 5 seconds to generate.  To prevent failed
+       // updates, increase this.
 
        define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache');
        // Local cache directory for RSS feeds
 
-       define('SIMPLEPIE_CACHE_DIR',   '/var/tmp/simplepie-ttrss-cache');
-       // Local cache directory for RSS feeds (simplepie)
-
        define('WEB_DEMO_MODE', false);
        // Demo mode with reduced functionality.
        // Warning: this option is obsolete. Don't rely on it being
@@ -27,9 +27,6 @@
        define('ICONS_URL', "icons");
        // Local and URL path to the directory, where feed favicons are stored.
 
-       define('USE_HTTP_AUTH', false);
-       // Use HTTP Basic authentication instead of login form. Has some problems.
-
        define('SINGLE_USER_MODE', true);
        // Operate in single user mode, disables all functionality related to
        // multiple users.
@@ -69,9 +66,6 @@
        define('GLOBAL_ENABLE_LABELS', false);
        // Labels are a security risk, so this option can globally disable them for all users.
 
-       define('ENABLE_LOGIN_SSL', false);
-       // Redirect to SSL url for login
-
        define('MAIL_RESET_PASS', true);
        // Send mail to user on password reset
        
@@ -147,7 +141,7 @@
        // If update daemon and update_feeds should send digests
        // Disable if you prefer querying special URL (see wiki)
 
-       define('CONFIG_VERSION', 5);
+       define('CONFIG_VERSION', 6);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).