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 72320bc5f7d19d6cd6993b8488facbf505d83fc2..5366120af6ce94b34676fd2e93a0e83e62b89ca9 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -24,9 +24,17 @@
        // 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
@@ -109,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.
@@ -125,7 +133,7 @@
        // *** Cookies and login sessions ***
        // **********************************
        
-       define('SESSION_COOKIE_LIFETIME', 86400*30);
+       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.
        // Setting this to zero will affect several user preferences
@@ -152,38 +160,15 @@
        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_PORT','');
-       // SMTP port to sent outgoing mail. Default is 25.
-
        define('SMTP_LOGIN', '');
        define('SMTP_PASSWORD', '');
        // These two options enable SMTP authentication when sending
        // outgoing mail. Only used with SMTP_HOST
 
-       // **************************************
-       // *** Update proces tuning settings  ***
-       // **************************************
-
-       define('FEED_FETCH_TIMEOUT', 45);
-       // How may seconds to wait for response when requesting feed from a site
-       // You may need to decease this if you see errors like "MySQL server
-       // has gone away" pop up in your feed update logs after fetching feeds
-       // from slow websites
-
-       define('FEED_FETCH_NO_CACHE_TIMEOUT', 15);
-       // How may seconds to wait for response when requesting feed from a
-       // site when that feed wasn't cached before
-
-       define('FILE_FETCH_TIMEOUT', 45);
-       // Default timeout when fetching files from remote sites
-
-       define('FILE_FETCH_CONNECT_TIMEOUT', 15);
-       // How many seconds to wait for initial response from website when
-       // fetching files from remote sites
-
        // ***************************************
        // *** Other settings (less important) ***
        // ***************************************
@@ -198,7 +183,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_remote, auth_internal, note, updater');
+       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_*).