MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296677
Change subject: Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF into
CommonSettings"
......................................................................
Revert "Cleanup: Move never-altered GlobalBlockingBlockXFF into CommonSettings"
This reverts commit b4d232a8362283b58b09d08e3d767242aa5002d7.
Change-Id: I772ca6b7d2cae523e95c1b40148e20e4a628fb87
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/77/296677/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e94a116..c531a75 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -918,7 +918,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
- $wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
+ $wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
}
include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index a52f20d..0cf6d43 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16834,6 +16834,11 @@
],
### End (roughly) of general extensions ########################
+// Apply blocks to IPs in XFF (T25343)
+'wmgUseXFFBlocks' => [
+ 'default' => true,
+],
+
'wgUseTidy' => [
'default' => true,
'foundationwiki' => false,
--
To view, visit https://gerrit.wikimedia.org/r/296677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I772ca6b7d2cae523e95c1b40148e20e4a628fb87
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
