jenkins-bot has submitted this change and it was merged.
Change subject: Fix wgCopyUploadsDomains on Commons Beta
......................................................................
Fix wgCopyUploadsDomains on Commons Beta
Commit 6528c0be has rewritten the wgCopyUploadsDomains setting for
commonswiki in Labs.
This site is also used by GLAM people for GWT training, so regular
whitelisted domains are still needed too.
Thanks to Kelson to have reported this issue.
Bug: T132285
Change-Id: Iaac0468b9f532e21db3cf715ef613c0dd4cf3e91
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Dereckson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 59de815..1e4c3d0 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -346,6 +346,11 @@
$wgMessageCacheType = CACHE_ACCEL;
+// Let Beta Cluster Commons do upload-from-URL from production Commons.
+if ( $wgDBname == 'commonswiki' ) {
+ $wgCopyUploadsDomains[] = 'upload.wikimedia.org';
+}
+
// Test of new import source configuration on labs cluster
$wgImportSources = false;
include( "$wmfConfigDir/import.php" );
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 77a8933..738730e 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -634,10 +634,6 @@
'wmgUseCollection' => array(
'zhwiki' => true, // T128425
),
- // Let Beta Cluster Commons do upload-from-URL from production
Commons.
- 'wgCopyUploadsDomains' => array(
- '+commonswiki' => array( 'upload.wikimedia.org' )
- ),
'wgMaxUploadSize' => array(
// Affects URL uploads and chunked uploads (experimental).
// Limit on other web uploads is enforced by PHP.
--
To view, visit https://gerrit.wikimedia.org/r/282495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaac0468b9f532e21db3cf715ef613c0dd4cf3e91
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
