Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292615
Change subject: Cleanup: Move never-altered GlobalBlockingBlockXFF into
CommonSettings
......................................................................
Cleanup: Move never-altered GlobalBlockingBlockXFF into CommonSettings
Change-Id: I530a6101de26658ed27cd6f1f31feee2d1396f11
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/15/292615/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index aebcaa1..70df0d7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -910,7 +910,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
- $wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
+ $wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
}
include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 94dcc7d..64b5a66 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16728,11 +16728,6 @@
],
### 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/292615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I530a6101de26658ed27cd6f1f31feee2d1396f11
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
