X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=config.php-dist;h=da9237ff6d455df08d768acd368030f7088d1506;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hp=4e231a6f0c81d9a81085dc9e85b3b33c33452038;hpb=81745ce738542b6a8fc8523ead13d91c5a246cd5;p=tt-rss.git

diff --git a/config.php-dist b/config.php-dist
old mode 100644
new mode 100755
index 4e231a6f..da9237ff
--- a/config.php-dist
+++ b/config.php-dist
@@ -1,145 +1,110 @@
 <?php
-	// Database server configuration
+	// *******************************************
+	// *** Database configuration (important!) ***
+	// *******************************************
+
 	define('DB_TYPE', "pgsql"); // or mysql
 	define('DB_HOST', "localhost");
 	define('DB_USER', "fox");
 	define('DB_NAME', "fox");
 	define('DB_PASS', "XXXXXX");
-	//define('DB_PORT', '5432'); // when neeeded, PG-only
+	define('DB_PORT', ''); // usually 5432 for PostgreSQL, 3306 for MySQL
+
+	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.
+
+	// ***********************************
+	// *** Basic settings (important!) ***
+	// ***********************************
 
-	define('SELF_URL_PATH', 'http://yourserver/tt-rss/');
+	define('SELF_URL_PATH', 'http://example.org/tt-rss/');
 	// Full URL of your tt-rss installation. This should be set to the
-	// location of tt-rss directory, e.g. http://yourserver/tt-rss/
+	// location of tt-rss directory, e.g. http://example.org/tt-rss/
 	// You need to set this option correctly otherwise several features
 	// including PUSH, bookmarklets and browser integration will not work properly.
 
-	define('SINGLE_USER_MODE', true);
+	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 ***
+	// *****************************
+
+	define('PHP_EXECUTABLE', '/usr/bin/php');
+	// Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss
+	// programs and update daemon. Do not try to use CGI binary here, it won't work.
+	// If you see HTTP headers being displayed while running tt-rss scripts,
+	// then most probably you are using the CGI binary. If you are unsure what to
+	// put in here, ask your hosting provider.
+
+	define('LOCK_DIRECTORY', 'lock');
+	// Directory for lockfiles, must be writable to the user you run
+	// daemon process or cronjobs under.
+
 	define('CACHE_DIR', 'cache');
 	// Local cache directory for RSS feed content.
 
-	define('SIMPLEPIE_CACHE_IMAGES', false);
-	// Allow caching feed images when using SimplePie, to bypass hotlink
-	// prevention and such at expense of local disk space and bandwidth.
-	// Note that you (or your users) also have to enable image caching 
-	// in feed editor.
-
 	define('ICONS_DIR', "feed-icons");
 	define('ICONS_URL', "feed-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.
 
-	define('TMP_DIRECTORY', '/tmp');
-	// Directory for temporary files
-
-	define('DAEMON_SLEEP_INTERVAL', 120);
-	// Interval between update daemon update runs
-
-	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', 1);
-	// Check client IP address when validating session:
-	// 0 - disable checking
-	// 1 - check first 3 octets of an address (recommended)
-	// 2 - check first 2 octets of an address
-	// 3 - check entire address
-
-	define('SESSION_COOKIE_LIFETIME', 0);
-	// 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 haven't logged in specified 
-	// amount of days. 0 disables.
-
-	define('CHECK_FOR_NEW_VERSION', true);
-	// Check for new versions of tt-rss automatically.
-
-	define('DIGEST_ENABLE', true);
-	// Global option to enable daily digests. Also toggles the ability of users
-	// to forward articles by email.
-
-	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('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', 0);
-	// Which feed parsing library to use as default:
-	// 0 - Magpie
-	// 1 - SimplePie
-
-	define('COUNTERS_MAX_AGE', 365);
-	// Hard limit for unread counters calculation. Try tweaking this
-	// parameter to speed up tt-rss when having a huge number of articles
-	// in the database (better yet, enable purging!)
-
-	define('DIGEST_FROM_NAME', 'Tiny Tiny RSS');
-	define('DIGEST_FROM_ADDRESS', 'noreply@your.domain.dom');
-	// Name, address and subject for sending outgoing mail. This applies
-	// to password reset notifications, digest emails and any other mail.
-
-	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
-	// Subject line for email digests
+	// **********************
+	// *** Authentication ***
+	// **********************
 
-	define('DIGEST_SMTP_HOST', '');
-	// SMTP Host to send outgoing mail. Blank - use system MTA.
+	// Please see PLUGINS below to configure various authentication modules.
 
-	define('DIGEST_SMTP_LOGIN', '');
-	define('DIGEST_SMTP_PASSWORD', '');
-	// These two options enable SMTP authentication when sending
-	// outgoing mail. Require DIGEST_SMTP_HOST.
+	define('AUTH_AUTO_CREATE', true);
+	// Allow authentication modules to auto-create users in tt-rss internal
+	// database when authenticated successfully.
 
-	define('DAEMON_FEED_LIMIT', 100);
-	// Limits the amount of feeds daemon (or a cronjob) updates on one run
+	define('AUTH_AUTO_LOGIN', true);
+	// Automatically login user on remote or other kind of externally supplied
+	// authentication, otherwise redirect to login form as normal.
+	// If set to true, users won't be able to set application language
+	// and settings profile.
 
-	define('ALLOW_REMOTE_USER_AUTH', false);
-	// 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.
+	// *********************
+	// *** Feed settings ***
+	// *********************
 
-	define('AUTO_LOGIN', false);
-	// 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('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)
+	// older than this amount of days are purged.
 
-	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
+	// ****************************
+	// *** Sphinx search plugin ***
+	// ****************************
 
-	define('LOCK_DIRECTORY', 'lock');
-	// Directory for lockfiles, must be writable to the user you run
-	// daemon process or cronjobs under.
+	define('SPHINX_SERVER', 'localhost:9312');
+	// Hostname:port combination for the Sphinx server.
 
-	define('ENABLE_GZIP_OUTPUT', false);
-	// Selectively gzip output to improve wire performance. This requires
-	// PHP Zlib extension on the server.
+	define('SPHINX_INDEX', 'ttrss, delta');
+	// Index name in Sphinx configuration. You can specify multiple indexes
+	// as a comma-separated string.
+	// Example configuration files are available on tt-rss wiki.
 
-	define('PHP_EXECUTABLE', '/usr/bin/php');
-	// Path to PHP executable
+	// ***********************************
+	// *** Self-registrations by users ***
+	// ***********************************
 
 	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.
@@ -151,46 +116,65 @@
 	// Maximum amount of users which will be allowed to register on this
 	// system. 0 - no limit.
 
-	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.
+	// **********************************
+	// *** Cookies and login sessions ***
+	// **********************************
 
-	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) 
-	// older than this amount of days are purged.
+	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('SPHINX_ENABLED', false);
-	// Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
-	// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
+	// *********************************
+	// *** Email and digest settings ***
+	// *********************************
 
-	define('SPHINX_INDEX', 'ttrss');
-	// Index name in Sphinx configuration. You can specify multiple indexes
-	// as a comma-separated string.
+	// Tiny Tiny RSS sends mail via PHP mail() function, unless handled
+	// by a plugin.
 
-	define('ENABLE_TWEET_BUTTON', false);
-	// Enable 'tweet this' button for articles
+	// If you need SMTP support, take a look here:
+	// https://git.tt-rss.org/fox/ttrss-mailer-smtp
 
-	define('CONSUMER_KEY', '');
-	define('CONSUMER_SECRET', '');
-	// Your OAuth instance authentication information for Twitter, visit
-	// http://twitter.com/oauth_clients to register your instance.
+	define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
+	define('SMTP_FROM_ADDRESS', 'noreply@your.domain.dom');
+	// Name, address and subject for sending outgoing mail. This applies
+	// to password reset notifications, digest emails and any other mail.
 
-	define('PUBSUBHUBBUB_HUB', '');
-	// URL to a PubSubHubbub-compatible hub server. If defined, "Published
-	// articles" generated feed would automatically become PUSH-enabled.
+	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
+	// Subject line for email digests
 
-	define('PUBSUBHUBBUB_ENABLED', true);
-	// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
-	// won't try to subscribe to PUSH feed updates.
+	// ***************************************
+	// *** Other settings (less important) ***
+	// ***************************************
 
-	define('ISCONFIGURED', false);
-	// Please set this to true if you have read everything above and
-	// finished setting configuration options.
+	define('CHECK_FOR_UPDATES', true);
+	// Check for updates automatically if running Git version
 
-	define('CONFIG_VERSION', 23);
+	define('ENABLE_GZIP_OUTPUT', false);
+	// Selectively gzip output to improve wire performance. This requires
+	// PHP Zlib extension on the server.
+	// Enabling this can break tt-rss in several httpd/php configurations,
+	// if you experience weird errors and tt-rss failing to start, blank pages
+	// after login, or content encoding errors, disable it.
+
+	define('PLUGINS', '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.
+	// Disabling auth_internal in this list would automatically disable
+	// reset password link on the login form.
+
+	define('LOG_DESTINATION', 'sql');
+	// Error log destination to use. Possible values: sql (uses internal logging
+	// you can read in Preferences -> System), syslog - logs to system log.
+	// Setting this to blank uses PHP logging (usually to http server
+	// error.log).
+	// Note that feed updating daemons don't use this logging facility
+	// for normal output.
+
+	define('CONFIG_VERSION', 26);
 	// Expected config version. Please update this option in config.php
 	// if necessary (after migrating all new options from this file).
 
 	// vim:ft=php
-?>