config: remove option ENABLE_UPDATE_DAEMON

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

diff --git a/config.php-dist b/config.php-dist
index 4b6ab2975db34da16dfdb7ddd2934abb851382b5..1fccbfccca57971968cd5411d1c0b1e652cbb6f0 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -9,6 +9,10 @@
        define('DB_PASS', "XXXXXX");
        //define('DB_PORT', '5432'); // when neeeded, PG-only
 
+       define('SELF_URL_PATH', 'http://localhost/tt-rss');
+       // Full URL of your tt-rss installation. You need to set this option
+       // correctly for tt-rss to function properly.
+
        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
@@ -18,15 +22,14 @@
        define('MAGPIE_CACHE_DIR', 'cache/magpie');
        // Local cache directory for RSS feeds
 
-       define('MAGPIE_CACHE_AGE', 60*30); 
-       // How long to store cached RSS objects? In seconds.
-       // Defaults to 30 minutes
-
        define('ICONS_DIR', "icons");
        define('ICONS_URL', "icons");
        // Local and URL path to the directory, where feed favicons are stored.
        // Unless you really know what you're doing, please keep those relative
        // to tt-rss main directory.
+       // Please note that Apache may reserve /icons/ URL to itself so you might
+       // need to change this and rename icons/ directory if you install tt-rss
+       // into website root.
 
        define('SINGLE_USER_MODE', true);
        // Operate in single user mode, disables all functionality related to
@@ -35,12 +38,6 @@
        define('TMP_DIRECTORY', '/tmp');
        // Directory for temporary files
 
-       define('ENABLE_UPDATE_DAEMON', false);
-       // This enables different mechanism for user-triggered updates designed
-       // for update daemon running in background on the server.
-       // This option suggests FEEDS_FRAME_REFRESH set to a small value 
-       // (like 60 seconds, depending on number of users and server/bandwidth load).
-
        define('DAEMON_SLEEP_INTERVAL', 120);
        // Interval between update daemon update runs
 
@@ -82,14 +79,11 @@
        // If update daemon and update_feeds should send digests
        // Disable if you prefer querying special URL (see wiki)
 
-       define('ENABLE_TRANSLATIONS', true);
-       // Enable support for interface translations
-
        define('MYSQL_CHARSET', 'UTF8');
        // Connection charset for MySQL. If you have a legacy database and/or experience
        // garbage unicode characters with this option, try setting it to a blank string.
 
-       define('DEFAULT_UPDATE_METHOD', 1);
+       define('DEFAULT_UPDATE_METHOD', 0);
        // Which feed parsing library to use as default:
        // 0 - Magpie
        // 1 - SimplePie
@@ -128,15 +122,22 @@
        // Limits the amount of feeds daemon (or a cronjob) updates on one run
 
        define('ALLOW_REMOTE_USER_AUTH', false);
-   // Set to 'true' if you trust your web server's REMOTE_USER
-       // environment variable to validate that the user is logged in. This
-       // option can be used to integrate tt-rss with Apache's external
-       // authentication modules.
+       // Set to 'true' if you trust your web server's REMOTE_USER 
+       // environment variable that the user is logged in. This option can be 
+       // used to integrate tt-rss with Apache's external authentication modules.
 
        define('AUTO_LOGIN', false);
-       // Set this to true if you use ALLOW_REMOTE_USER_AUTH and you want
-       // to skip the login form. If set to true, users won't be able to
-       // set application language and settings profile.
+       // Set this to true if you use ALLOW_REMOTE_USER_AUTH or client SSL
+       // certificate authentication and you want to skip the login form. 
+       // If set to true, users won't be able to set application language 
+       // and settings profile.
+       // Otherwise users will be redirected to login form with their login
+       // information pre-filled.
+
+       define('AUTO_CREATE_USER', false);
+       // If users are authenticated by your web server, set this to true if
+       // You want new users to be automaticaly created in tt-rss database
+       // on first login
 
        define('LOCK_DIRECTORY', 'lock');
        // Directory for lockfiles, must be writable to the user you run
@@ -186,7 +187,15 @@
        // Your OAuth instance authentication information for Twitter, visit
        // http://twitter.com/oauth_clients to register your instance.
 
-       define('CONFIG_VERSION', 21);
+       define('PUBSUBHUBBUB_HUB', '');
+       // URL to a PubSubHubbub-compatible hub server. If defined, Published
+       // articles generated feeds would automatically become PUSH-enabled.
+
+       define('ISCONFIGURED', false);
+       // Please set this to true if you have read everything above and
+       // finished setting configuration options.
+
+       define('CONFIG_VERSION', 22);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).