unify SMTP_HOST and SMTP_PORT as SMTP_SERVER

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

diff --git a/config.php-dist b/config.php-dist
index db6ec661f8e8702d1c40d8d3579fc94e2a3b4095..5366120af6ce94b34676fd2e93a0e83e62b89ca9 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -24,9 +24,26 @@
        // You need to set this option correctly otherwise several features
        // including PUSH, bookmarklets and browser integration will not work properly.
 
+       define('FEED_CRYPT_KEY', '');
+   // Key used for encryption of login/passwords for password-protected feeds
+   // in the database. A string of 24 random characters. If left blank, encryption
+       // is not used. Requires mcrypt functions.
+       // Warning: changing this key will make your stored feed passwords impossible
+       // to decrypt.
+       
        define('SINGLE_USER_MODE', false);
        // Operate in single user mode, disables all functionality related to
-       // multiple users.
+       // multiple users and authentication. Enabling this assumes you have
+       // your tt-rss directory protected by other means (e.g. http auth).
+
+       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 ***
@@ -100,7 +117,7 @@
        // ***********************************
 
        define('ENABLE_REGISTRATION', false);
-       // Allow users to register themselves. Please be vary that allowing
+       // Allow users to register themselves. Please be aware that allowing
        // random people to access your tt-rss installation is a security risk
        // and potentially might lead to data loss or server exploit. Disabled
        // by default.
@@ -116,13 +133,13 @@
        // *** Cookies and login sessions ***
        // **********************************
        
-       define('SESSION_COOKIE_LIFETIME', 0);
+       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.
-
-       define('SESSION_EXPIRE_TIME', 86400);
-       // Hard expiration limit for sessions. Should be
-       // greater or equal to SESSION_COOKIE_LIFETIME
+       // 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:
@@ -143,9 +160,10 @@
        define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
        // Subject line for email digests
 
-       define('SMTP_HOST', '');
-       // SMTP Host to send outgoing mail. Blank - use system MTA.
-
+       define('SMTP_SERVER', '');
+       // Hostname:port combination to send outgoing mail (i.e. localhost:25). 
+       // Blank - use system MTA.
+       
        define('SMTP_LOGIN', '');
        define('SMTP_PASSWORD', '');
        // These two options enable SMTP authentication when sending
@@ -165,22 +183,13 @@
        // if you experience weird errors and tt-rss failing to start, blank pages
        // after login, or content encoding errors, disable it.
 
-       define('PLUGINS', 'auth_remote, auth_internal, note');
+       define('PLUGINS', 'auth_internal, note, updater');
        // 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('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('OWNCLOUD_URL', '');
-       // owncloud-plugin:
-       // This is the base url of your owncloud server as called from the browser
-        // Actually this is a server global parameter only
-
        define('CONFIG_VERSION', 26);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).