X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=config.php-dist;h=ac4e098c536c4de0cd10b0de932ed11b740ad44e;hb=22366ccc5b4b82f6867ded767b318b1ac9978270;hp=0d1bfbc01da0fdacc1af0867f4cfcbe3ec45d29c;hpb=e177ce2b497fdfc58250821525154ae46f2b6e5c;p=tt-rss.git

diff --git a/config.php-dist b/config.php-dist
old mode 100644
new mode 100755
index 0d1bfbc0..ac4e098c
--- a/config.php-dist
+++ b/config.php-dist
@@ -23,13 +23,6 @@
 	// 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('FEED_CRYPT_KEY', '');
-	// Key used for encryption of 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
@@ -50,10 +43,11 @@
 	// *****************************
 
 	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.
+	// 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
@@ -93,23 +87,9 @@
 	// intervals is disabled and all articles (which are not starred) 
 	// older than this amount of days are purged.
 
-	// *** PubSubHubbub settings ***
-
-	define('PUBSUBHUBBUB_HUB', '');
-	// URL to a PubSubHubbub-compatible hub server. If defined, "Published
-	// articles" generated feed would automatically become PUSH-enabled.
-
-	define('PUBSUBHUBBUB_ENABLED', false);
-	// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
-	// won't try to subscribe to PUSH feed updates.
-
-	// *********************
-	// *** Sphinx search ***
-	// *********************
-
-	define('SPHINX_ENABLED', false);
-	// Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
-	// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
+	// ****************************
+	// *** Sphinx search plugin ***
+	// ****************************
 
 	define('SPHINX_SERVER', 'localhost:9312');
 	// Hostname:port combination for the Sphinx server.
@@ -144,13 +124,6 @@
 	// Default lifetime of a session (e.g. login) cookie. In seconds, 
 	// 0 means cookie will be deleted when browser closes.
 
-	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
-
 	// *********************************
 	// *** Email and digest settings ***
 	// *********************************
@@ -173,15 +146,16 @@
 	// outgoing mail. Only used with SMTP_SERVER.
 
 	define('SMTP_SECURE', '');
-	// used to select a secure SMTP conneciton.  can be tls, ssl or enpty
+	// Used to select a secure SMTP connection. Allowed values: ssl, tls,
+	// or empty.
 	
 	// ***************************************
 	// *** Other settings (less important) ***
 	// ***************************************
 
-	define('CHECK_FOR_NEW_VERSION', true);
-	// Check for new versions of tt-rss automatically.
-
+	define('CHECK_FOR_UPDATES', true);
+	// Check for updates automatically if running Git version
+ 
 	define('ENABLE_GZIP_OUTPUT', false);
 	// Selectively gzip output to improve wire performance. This requires
 	// PHP Zlib extension on the server.
@@ -189,7 +163,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_internal, note, updater');
+	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_*).
@@ -199,14 +173,15 @@
 	// reset password link on the login form.
 	
 	define('LOG_DESTINATION', 'sql');
-	// Log destination to use. Possible values: sql (uses internal logging
+	// 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
-?>