X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=config.php-dist;h=3f48c5420d2d8cc6d3ddce373ec610ae8c78cecb;hb=d15f8675175be1cb11cb0229d2f8d6d2b0c9e36f;hp=7787727b0290ffa7699a7629d41a57baa3899adb;hpb=5ccc1cf5d763251fb1c8029cfd4e9f81e614a3a2;p=tt-rss.git

diff --git a/config.php-dist b/config.php-dist
index 7787727b..3f48c542 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -1,4 +1,4 @@
-<?
+<?php
 	// Your RDBMS must be configured to accept connections
 	// via TCP/IP and authentified by password.
 
@@ -7,20 +7,30 @@
 	define('DB_USER', "fox");
 	define('DB_NAME', "fox");
 	define('DB_PASS', "XXXXXX");
+	//define('DB_PORT', '5432'); // when neeeded, PG-only
+
+	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('MAGPIE_CACHE_AGE', 60*30); 
+	// How long to store cached RSS objects? In seconds.
+	// Defaults to 30 minutes
+
 	define('WEB_DEMO_MODE', false);
 	// Demo mode with reduced functionality.
+	// Warning: this option is obsolete. Don't rely on it being
+	// checked in all necessary places.
 
 	define('ICONS_DIR', "icons");
 	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.
@@ -60,14 +70,11 @@
 	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
 	
-	define('MAIL_FROM', 'TT-RSS Daemon <noreply@ttrss.your-shiny-host.org>');
-	// Pretty obvious, I suppose.
+	define('MAIL_FROM', 'TT-RSS Daemon <noreply@some.ttrss.host.dom>');
+	// Pretty obvious, I suppose. Used for email digests & password notifications.
 
 	define('ENABLE_FEED_BROWSER', true);
 	// Enable or disable local feed browser
@@ -90,29 +97,75 @@
 	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('DISABLE_SESSIONS', false);
-	// Never enable this option (kludge for daemon using tt-rss code)
-
 	define('DAEMON_SLEEP_INTERVAL', 120);
 	// Interval between update daemon update runs
 
-	define('DATABASE_BACKED_SESSIONS', true);
-	// Store session information in a database (recommended)
-	// Uses default PHP session storing mechanism if disabled
+	define('DATABASE_BACKED_SESSIONS', false);
+	// Store session information in a database, recommended for multiuser 
+	// configurations. Doesn't seem to work for everyone, so enable with caution.
+	// tt-rss uses default PHP session storing mechanism if disabled.
 
 	define('SESSION_CHECK_ADDRESS', true);
-	// Bind sessions to specific IP address (requires DATABASE_BACKED_SESSIONS)
+	// Bind session to client IP address (recommended)
 
 	define('SESSION_COOKIE_LIFETIME', 0);
-	// Default lifetime of a session cookie. In seconds, 
-	// 0 means delete on browser close
+	// 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
+
+	define('DAEMON_UPDATE_LOGIN_LIMIT', 0);
+	// Stop updating feeds of user who was never logged in
+	// in specified amount of days. 0 disables.
+
+	define('CHECK_FOR_NEW_VERSION', true);
+	// Check for new versions of tt-rss when entering preferences.
+
+	define('USE_CURL_FOR_ICONS', false);
+	// Fetch favicons using CURL, useful if your PHP has disabled remote fopen()
+
+	define('DIGEST_ENABLE', true);
+	// Global option to enable daily digests
+
+	define('DIGEST_HOSTNAME', 'some.ttrss.host.dom');
+	// Hostname for email digest signature
+
+	define('DIGEST_EMAIL_LIMIT', 10);
+	// The maximum amount of emails sent in one digest batch
+
+	define('DAEMON_SENDS_DIGESTS', true);
+	// If update daemon and update_feeds should send digests
+	// Disable if you prefer querying special URL (see wiki)
+
+	define('ENABLE_TRANSLATIONS', false);
+	// Enable experimental support for interface translations
+	// based on PHP-Gettext. This is of no much use right now.
+
+	define('MYSQL_CHARSET', '');
+	// Connection charset for MySQL. Only enable if having charset-related
+	// errors with MySQL (mangled characters, errors when updating feeds, etc).
+
+	define('ENABLE_SIMPLEPIE', false);
+	// Enables SimplePie RSS parsing library (experimental). When this option 
+	// is disabled, Tiny Tiny RSS defaults to Magpie library. 
+
+	// SimplePie is somewhat faster, more robust and less clunky as Magpie. 
+	// While it doesn't internally support HTTP Digest authentication 
+	// (required for Livejournal protected feeds and such) and SSL, it can
+	// support it when using CURL.
+
+	// To summarize, if your PHP has CURL extension or you aren't subscribed
+	// to any feeds using HTTP Digest authentication and Magpie XML parsing 
+	// errors are bothering you too much, you can try enabling SimplePie.
 
-	define('SESSION_COOKIE_LIFETIME_REMEMBER', 3600);
-	// Session cookie lifetime if "remember me" is checked on login.
+	define('CONFIG_VERSION', 9);
+	// Expected config version. Please update this option in config.php
+	// if necessary (after migrating all new options from this file).
 
 	// vim:ft=php
 ?>