daemon: enable master lockfile

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

diff --git a/config.php-dist b/config.php-dist
index ed76536b9bc2296ef174448e534521c067205ea0..b1f238ca010d6acd7b707daf768f76e3ee94115c 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -28,6 +28,15 @@
        // Operate in single user mode, disables all functionality related to
        // multiple users.
 
+       define('SIMPLE_UPDATE_MODE', false);
+       // Enables fallback update mode where tt-rss tries to update feeds in
+       // background while tt-rss is open in your browser. 
+       // If you don't have a lot of feeds and don't want to or can't run 
+       // background processes while not running tt-rss, this method is generally 
+       // viable to keep your feeds up to date.
+       // Still, there are more robust (and recommended) updating methods 
+       // available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds
+
        // *****************************
        // *** Files and directories ***
        // *****************************
@@ -52,13 +61,7 @@
        // *** Authentication ***
        // **********************
 
-       define('AUTH_MODULES', 'internal');
-       // Comma-separated list of authentication modules to use. 
-       // Available modules are:
-       // 1. internal - tt-rss internal user DB
-       // 2. remote - use server REMOTE_USER variable or client SSL certificate if enabled
-       // in preferences
-       //
+       // Please see PLUGINS below to configure various authentication modules.
 
        define('AUTH_AUTO_CREATE', true);
        // Allow authentication modules to auto-create users in tt-rss internal
@@ -74,11 +77,6 @@
        // *** Feed settings ***
        // *********************
 
-       define('DEFAULT_UPDATE_METHOD', 0);
-       // Which feed parsing library to use as default:
-       // 0 - Magpie
-       // 1 - SimplePie
-
        define('FORCE_ARTICLE_PURGE', 0);
        // When this option is not 0, users ability to control feed purging
        // intervals is disabled and all articles (which are not starred) 
@@ -162,15 +160,6 @@
        // These two options enable SMTP authentication when sending
        // outgoing mail. Only used with SMTP_HOST
 
-       // ************************************
-       // *** Twitter integration settings ***
-       // ************************************
-       
-       define('CONSUMER_KEY', '');
-       define('CONSUMER_SECRET', '');
-       // Your OAuth instance authentication information for Twitter, visit
-       // http://twitter.com/oauth_clients to register your instance.
-
        // ***************************************
        // *** Other settings (less important) ***
        // ***************************************
@@ -185,15 +174,12 @@
        // if you experience weird errors and tt-rss failing to start, blank pages
        // after login, or content encoding errors, disable it.
 
-       define('FEEDBACK_URL', '');
-       // Displays an URL for users to provide feedback or comments regarding
-       // this instance of tt-rss. Can lead to a forum, contact email, etc.
-
-       define('ARTICLE_BUTTON_PLUGINS', 'note,tweet,share,mail');
-       // Comma-separated list of additional article action button plugins
-       // to enable, like tweet button, etc.
-       // The following plugins are available: note, tweet, share, mail
-       // More plugins: http://tt-rss.org/wiki/Plugins
+       define('PLUGINS', 'auth_remote, 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_*).
+       // Users may enable other user plugins from Preferences/Plugins but may not
+       // disable plugins specified in this list.
 
        define('CONFIG_VERSION', 26);
        // Expected config version. Please update this option in config.php