jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380950 )
Change subject: Enable 3D on test & test2
......................................................................
Enable 3D on test & test2
Change-Id: I048b225b691a6f0da40ff01ba66e0cb6c27117e4
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
4 files changed, 24 insertions(+), 17 deletions(-)
Approvals:
MarkTraceur: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index d407f49..8278b7d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -345,19 +345,6 @@
// Reenable Preview and Changes tabs for wikieditor preview
$wgHiddenPrefs = array_diff( $wgHiddenPrefs, [ 'wikieditor-preview' ] );
-// MultimediaViewer is a dependency of 3d extension
-if ( $wmgUse3d && $wmgUseMultimediaViewer ) {
- wfLoadExtension( '3D' );
- // Add 3d file type
- $wgFileExtensions[] = 'stl';
- $wgTrustedMediaFiles[] = 'application/sla';
-
- // Add 3d media viewer extension
- $wgMediaViewerExtensions['stl'] = 'mmv.3d';
-
- $wg3dProcessor = [ '/usr/bin/xvfb-run', '-a', '-s', '-ac -screen 0
1280x1024x24' ,'/srv/deployment/3d2png/deploy/src/3d2png.js' ];
-}
-
if ( $wmgUseNewWikiDiff2Extension ) {
$wgWikiDiff2MovedParagraphDetectionCutoff = 25;
}
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d06a4c7..d7c2364 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3633,6 +3633,20 @@
wfLoadExtension( 'DynamicSidebar' );
}
+// MultimediaViewer is a dependency of 3d extension
+if ( $wmgUse3d && $wmgUseMultimediaViewer ) {
+ wfLoadExtension( '3D' );
+
+ // Add 3d file type
+ $wgFileExtensions[] = 'stl';
+ $wgTrustedMediaFiles[] = 'application/sla';
+
+ // Add 3d media viewer extension
+ $wgMediaViewerExtensions['stl'] = 'mmv.3d';
+
+ $wg3dProcessor = [ '/usr/bin/xvfb-run', '-a', '-s', '-ac -screen 0
1280x1024x24' ,'/srv/deployment/3d2png/deploy/src/3d2png.js' ];
+}
+
if ( $wmfRealm === 'labs' ) {
require "$wmfConfigDir/CommonSettings-labs.php";
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index cb535bb..992f4ef 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -633,10 +633,6 @@
'default' => true,
],
- 'wg3dProcessEnviron' => [
- 'default' => [ 'DISPLAY' => ':99' ],
- ],
-
// Test jQuery 3 (T124742)
'wgUsejQueryThree' => [
'default' => true,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cc4e4b2..1e38332 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19569,6 +19569,16 @@
'default' => [ 'legacy', 'html5' ],
],
+'wmgUse3d' => [
+ 'default' => false,
+ 'testwiki' => true,
+ 'test2wiki' => true,
+],
+
+'wg3dProcessEnviron' => [
+ 'default' => [ 'DISPLAY' => ':99' ],
+],
+
];
### WMF Labs override #####
--
To view, visit https://gerrit.wikimedia.org/r/380950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I048b225b691a6f0da40ff01ba66e0cb6c27117e4
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
