X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=f68c0ef3dd1a2a6eb6a60946031d383b409b4617;hb=9fbb5b9ea8f9e83ac2d5d3bb7fd3cee38b2eeff6;hp=ec600dc2e60db4aba5229ec37e1a66936b4c29ef;hpb=5aa7acd4a4576f99f4b7dd7c7bcbf7144aabf13f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index ec600dc2e6..f68c0ef3dd 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2440,10 +2440,8 @@ $wgStyleVersion = '303'; /** * This will cache static pages for non-logged-in users to reduce - * database traffic on public sites. - * Automatically sets $wgShowIPinHeader = false - * ResourceLoader requests to default language and skins are cached - * as well as single module requests. + * database traffic on public sites. ResourceLoader requests to default + * language and skins are cached as well as single module requests. */ $wgUseFileCache = false; @@ -2536,7 +2534,7 @@ $wgExtensionInfoMTime = false; /** @} */ # end of cache settings /************************************************************************//** - * @name HTTP proxy (Squid) settings + * @name HTTP proxy (CDN) settings * * Many of these settings apply to any HTTP proxy used in front of MediaWiki, * although they are referred to as Squid settings for historical reasons. @@ -2549,7 +2547,7 @@ $wgExtensionInfoMTime = false; */ /** - * Enable/disable Squid. + * Enable/disable CDN. * See https://www.mediawiki.org/wiki/Manual:Squid_caching */ $wgUseSquid = false; @@ -2577,7 +2575,7 @@ $wgUseKeyHeader = false; $wgVaryOnXFP = false; /** - * Internal server name as known to Squid, if different. + * Internal server name as known to CDN, if different. * * @par Example: * @code @@ -2589,7 +2587,7 @@ $wgInternalServer = false; /** * Cache TTL for the CDN sent as s-maxage (without ESI) or * Surrogate-Control (with ESI). Without ESI, you should strip - * out s-maxage in the Squid config. + * out s-maxage in the CDN config. * * 18000 seconds = 5 hours, more cache hits with 2678400 = 31 days. */ @@ -2602,6 +2600,15 @@ $wgSquidMaxage = 18000; */ $wgCdnMaxageLagged = 30; +/** + * If set, any SquidPurge call on a URL or URLs will send a second purge no less than + * this many seconds later via the job queue. This requires delayed job support. + * This should be safely higher than the 'max lag' value in $wgLBFactoryConf. + * + * @since 1.27 + */ +$wgCdnReboundPurgeDelay = 0; + /** * Default maximum age for raw CSS/JS accesses * @@ -3162,13 +3169,6 @@ $wgWellFormedXml = true; */ $wgXhtmlNamespaces = array(); -/** - * Show IP address, for non-logged in users. It's necessary to switch this off - * for some forms of caching. - * @warning Will disable file cache. - */ -$wgShowIPinHeader = true; - /** * Site notice shown at the top of each page * @@ -4342,6 +4342,21 @@ $wgActiveUserDays = 30; * @{ */ +/** + * Central ID lookup providers + * Key is the provider ID, value is a specification for ObjectFactory + * @since 1.27 + */ +$wgCentralIdLookupProviders = array( + 'local' => array( 'class' => 'LocalIdLookup' ), +); + +/** + * Central ID lookup provider to use by default + * @var string + */ +$wgCentralIdLookupProvider = 'local'; + /** * Password policy for local wiki users. A user's effective policy * is the superset of all policy statements from the policies for the @@ -4359,6 +4374,10 @@ $wgActiveUserDays = 30; * - PasswordCannotMatchUsername - Password cannot match username to * - PasswordCannotMatchBlacklist - Username/password combination cannot * match a specific, hardcoded blacklist. + * - PasswordCannotBePopular - Blacklist passwords which are known to be + * commonly chosen. Set to integer n to ban the top n passwords. + * If you want to ban all common passwords on file, use the + * PHP_INT_MAX constant. * @since 1.26 */ $wgPasswordPolicy = array( @@ -4367,11 +4386,13 @@ $wgPasswordPolicy = array( 'MinimalPasswordLength' => 8, 'MinimumPasswordLengthToLogin' => 1, 'PasswordCannotMatchUsername' => true, + 'PasswordCannotBePopular' => 25, ), 'sysop' => array( 'MinimalPasswordLength' => 8, 'MinimumPasswordLengthToLogin' => 1, 'PasswordCannotMatchUsername' => true, + 'PasswordCannotBePopular' => 25, ), 'bot' => array( 'MinimalPasswordLength' => 8, @@ -4391,6 +4412,7 @@ $wgPasswordPolicy = array( 'PasswordCannotMatchUsername' => 'PasswordPolicyChecks::checkPasswordCannotMatchUsername', 'PasswordCannotMatchBlacklist' => 'PasswordPolicyChecks::checkPasswordCannotMatchBlacklist', 'MaximalPasswordLength' => 'PasswordPolicyChecks::checkMaximalPasswordLength', + 'PasswordCannotBePopular' => 'PasswordPolicyChecks::checkPopularPasswordBlacklist' ), ); @@ -4584,6 +4606,7 @@ $wgDefaultUserOptions = array( 'watchlisthideown' => 0, 'watchlisthidepatrolled' => 0, 'watchlisthidecategorization' => 1, + 'watchlistreloadautomatically' => 0, 'watchmoves' => 0, 'watchrollback' => 0, 'wllimit' => 250, @@ -5671,79 +5694,6 @@ $wgProfileLimit = 0.0; */ $wgProfileOnly = false; -/** - * If true, print a raw call tree instead of per-function report - */ -$wgProfileCallTree = false; - -/** - * Should application server host be put into profiling table - * - * @deprecated set $wgProfiler['perhost'] = true instead - */ -$wgProfilePerHost = null; - -/** - * Host for UDP profiler. - * - * The host should be running a daemon which can be obtained from MediaWiki - * Git at: - * https://git.wikimedia.org/tree/operations%2Fsoftware.git/master/udpprofile - * - * @deprecated set $wgProfiler['udphost'] instead - */ -$wgUDPProfilerHost = null; - -/** - * Port for UDP profiler. - * @see $wgUDPProfilerHost - * - * @deprecated set $wgProfiler['udpport'] instead - */ -$wgUDPProfilerPort = null; - -/** - * Format string for the UDP profiler. The UDP profiler invokes sprintf() with - * (profile id, count, cpu, cpu_sq, real, real_sq, entry name, memory) as - * arguments. You can use sprintf's argument numbering/swapping capability to - * repeat, re-order or omit fields. - * - * @see $wgStatsFormatString - * @since 1.22 - * - * @deprecated set $wgProfiler['udpformat'] instead - */ -$wgUDPProfilerFormatString = null; - -/** - * Destination for wfIncrStats() data... - * 'cache' to go into the system cache, if enabled (memcached) - * 'udp' to be sent to the UDP profiler (see $wgUDPProfilerHost) - * false to disable - */ -$wgStatsMethod = 'cache'; - -/** - * When $wgStatsMethod is 'udp', setting this to a string allows statistics to - * be aggregated over more than one wiki. The string will be used in place of - * the DB name in outgoing UDP packets. If this is set to false, the DB name - * will be used. - */ -$wgAggregateStatsID = false; - -/** - * When $wgStatsMethod is 'udp', this variable specifies how stats should be - * formatted. Its value should be a format string suitable for a sprintf() - * invocation with (id, count, key) arguments, where 'id' is either - * $wgAggregateStatsID or the DB name, 'count' is the value by which the metric - * is being incremented, and 'key' is the metric name. - * - * @see $wgUDPProfilerFormatString - * @see $wgAggregateStatsID - * @since 1.22 - */ -$wgStatsFormatString = "stats/%s - %s 1 1 1 1 %s\n"; - /** * Destination of statsd metrics. * @@ -5757,15 +5707,13 @@ $wgStatsFormatString = "stats/%s - %s 1 1 1 1 %s\n"; $wgStatsdServer = false; /** - * Prefix for metric names sent to wgStatsdServer. - * - * Defaults to "MediaWiki". + * Prefix for metric names sent to $wgStatsdServer. * * @see RequestContext::getStats * @see BufferingStatsdDataFactory * @since 1.25 */ -$wgStatsdMetricPrefix = false; +$wgStatsdMetricPrefix = 'MediaWiki'; /** * InfoAction retrieves a list of transclusion links (both to and from). @@ -6188,7 +6136,14 @@ $wgRCEngines = array( ); /** - * Treat category membership changes as a RecentChange + * Treat category membership changes as a RecentChange. + * Changes are mentioned in RC for page actions as follows: + * - creation: pages created with categories are mentioned + * - edit: category additions/removals to existing pages are mentioned + * - move: nothing is mentioned (unless templates used depend on the title) + * - deletion: nothing is mentioned + * - undeletion: nothing is mentioned + * * @since 1.27 */ $wgRCWatchCategoryMembership = false; @@ -6741,9 +6696,11 @@ $wgJobClasses = array( 'PublishStashedFile' => 'PublishStashedFileJob', 'ThumbnailRender' => 'ThumbnailRenderJob', 'recentChangesUpdate' => 'RecentChangesUpdateJob', - 'refreshLinksPrioritized' => 'RefreshLinksJob', // for cascading protection - 'refreshLinksDynamic' => 'RefreshLinksJob', // for pages with dynamic content + 'refreshLinksPrioritized' => 'RefreshLinksJob', + 'refreshLinksDynamic' => 'RefreshLinksJob', 'activityUpdateJob' => 'ActivityUpdateJob', + 'categoryMembershipChange' => 'CategoryMembershipChangeJob', + 'cdnPurge' => 'CdnPurgeJob', 'enqueue' => 'EnqueueJob', // local queue for multi-DC setups 'null' => 'NullJob' ); @@ -7020,8 +6977,8 @@ $wgLogActionsHandlers = array( 'delete/event' => 'DeleteLogFormatter', 'delete/restore' => 'DeleteLogFormatter', 'delete/revision' => 'DeleteLogFormatter', - 'import/interwiki' => 'LogFormatter', - 'import/upload' => 'LogFormatter', + 'import/interwiki' => 'ImportLogFormatter', + 'import/upload' => 'ImportLogFormatter', 'managetags/activate' => 'LogFormatter', 'managetags/create' => 'LogFormatter', 'managetags/deactivate' => 'LogFormatter', @@ -7776,6 +7733,28 @@ $wgVirtualRestConfig = array( */ $wgSearchRunSuggestedQuery = true; +/** + * Where popular password file is located. + * + * Default in core contains 50,000 most popular. This config + * allows you to change which file, in case you want to generate + * a password file with > 50000 entries in it. + * + * @see maintenance/createCommonPasswordCdb.php + * @since 1.27 + * @var string path to file + */ +$wgPopularPasswordFile = __DIR__ . '/../serialized/commonpasswords.cdb'; + +/* + * Max time (in seconds) a user-generated transaction can spend in writes. + * If exceeded, the transaction is rolled back with an error instead of being committed. + * + * @var int|bool Disabled if false + * @since 1.27 + */ +$wgMaxUserDBWriteDuration = false; + /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker