X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=config.php-dist;h=ac4e098c536c4de0cd10b0de932ed11b740ad44e;hb=2c940c4861b8d059e9de65826c8a0c48a025c519;hp=2d7a6d1956e84a3af6289de5ebda42cb0e147a18;hpb=baaf4c3043f428ec009dd48b85e1c2d6cb8abee4;p=tt-rss.git

diff --git a/config.php-dist b/config.php-dist
old mode 100644
new mode 100755
index 2d7a6d19..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
@@ -94,19 +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 ***
-	// *********************
+	// ****************************
+	// *** Sphinx search plugin ***
+	// ****************************
 
 	define('SPHINX_SERVER', 'localhost:9312');
 	// Hostname:port combination for the Sphinx server.
@@ -141,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 ***
 	// *********************************
@@ -177,15 +153,9 @@
 	// *** Other settings (less important) ***
 	// ***************************************
 
-	define('CHECK_FOR_NEW_VERSION', true);
-	// Check for new versions of tt-rss automatically.
-
-	define('DETECT_ARTICLE_LANGUAGE', false);
-	// Detect article language when updating feeds, presently this is only
-	// used for hyphenation. This may increase amount of CPU time used by 
-	// update processes, disable if necessary (i.e. you are being billed
-	// for CPU time).
-
+	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.
@@ -193,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_*).
@@ -203,10 +173,12 @@
 	// 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