Reedy has submitted this change and it was merged.
Change subject: Production configuration for GWToolset
......................................................................
Production configuration for GWToolset
Configure GWToolset for production use on commons.
Bug: 56181
Change-Id: I2d1c666e1d3f4689086cf40d564f238008671e02
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
4 files changed, 27 insertions(+), 1 deletion(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 837b49c..76823ea 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1799,6 +1799,16 @@
require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
}
+if ( $wmgUseGWToolset ) {
+ require_once( "$IP/extensions/GWToolset/GWToolset.php" );
+ $wgGWTFileBackend = 'local-multiwrite';
+ $wgGWTFBMaxAge = '1 week';
+ $wgJobTypesExcludedFromDefaultQueue[] = 'gwtoolsetUploadMetadataJob';
+ $wgJobTypesExcludedFromDefaultQueue[] = 'gwtoolsetUploadMediafileJob';
+ $wgJobTypesExcludedFromDefaultQueue[] =
'gwtoolsetGWTFileBackendCleanupJob';
+ $wgJobTypeConf['gwtoolsetUploadMetadataJob'] = array( 'checkDelay' =>
true ) + $wgJobTypeConf['default'];
+}
+
if ( $wmgUseMultimediaViewer ) {
require_once( "$IP/extensions/MultimediaViewer/MultimediaViewer.php" );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index a80f06d..23f6420 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9367,6 +9367,11 @@
'default' => true,
),
+'wmgUseGWToolset' => array(
+ 'default' => false,
+ 'commonswiki' => true,
+),
+
'wmgUseSpecialNuke' => array(
'default' => true,
'loginwiki' => false,
@@ -10314,6 +10319,17 @@
'wgCopyUploadsDomains' => array(
'default' => array( '*.flickr.com', '*.staticflickr.com', ),
'+testwiki' => array( 'upload.wikimedia.org' ),
+ '+commonswiki' => array(
+ '*.collectie.legermuseum.nl',
+ '*.europeana1914-1918.eu',
+ '*.gahetna.nl',
+ '*.hu-berlin.de',
+ '*.kb.nl',
+ '*.lndb.lv',
+ '*.memorix.nl',
+ '*.rbge.org.uk',
+ '*.rijksmuseum.nl',
+ ),
),
'wgMaxUploadSize' => array(
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index f241f71..3f350e5 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -59,6 +59,7 @@
$IP/extensions/GlobalUsage/GlobalUsage.php
$IP/extensions/GoogleNewsSitemap/GoogleNewsSitemap.php
$IP/extensions/GuidedTour/GuidedTour.php
+IP/extensions/GWToolset/GWToolset.php
$IP/extensions/ImageMap/ImageMap.php
$IP/extensions/InputBox/InputBox.php
$IP/extensions/Insider/Insider.php
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index fef7adb..e69de29 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1 +0,0 @@
-$IP/extensions/GWToolset/GWToolset.php
--
To view, visit https://gerrit.wikimedia.org/r/101061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d1c666e1d3f4689086cf40d564f238008671e02
Gerrit-PatchSet: 11
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dan-nl <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dan-nl <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
