Matthias Mullie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/350202 )
Change subject: Bring Extension:3D more in line with prod ...................................................................... Bring Extension:3D more in line with prod In production, the extension is 3D, with capital D. We don’t support amf files. And for 3d2png.js to run, libgl1-mesa-dri will also be required. Change-Id: If2bd6748151e7c3f889a10257b5093fd51b0e822 --- M puppet/modules/role/manifests/three_d.pp M puppet/modules/three_d/manifests/init.pp 2 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/02/350202/1 diff --git a/puppet/modules/role/manifests/three_d.pp b/puppet/modules/role/manifests/three_d.pp index 47e0bdc..9404f98 100644 --- a/puppet/modules/role/manifests/three_d.pp +++ b/puppet/modules/role/manifests/three_d.pp @@ -1,23 +1,19 @@ # == Class: role::three_d -# This role provisions the 3d[https://www.mediawiki.org/wiki/Extension:3d] extension, +# This role provisions the 3D[https://www.mediawiki.org/wiki/Extension:3D] extension, # which allows upload and viewing of 3d files. class role::three_d { require ::xvfb include ::role::multimediaviewer include ::three_d - mediawiki::extension { '3d': + mediawiki::extension { '3D': remote => 'https://phabricator.wikimedia.org/diffusion/ETHR/3d.git', settings => [ "\$wg3dProcessor = \"${::three_d::three_d_2png_dir}/3d2png.js\"", '$wg3dProcessEnviron = [ "DISPLAY" => ":99" ]', - '$wgFileExtensions[] = "amf"', '$wgFileExtensions[] = "stl"', - '$wgTrustedMediaFormats[] = "application/x-amf"', '$wgTrustedMediaFormats[] = "application/sla"', - '$wgXMLMimeTypes["amf"] = "application/x-amf"', '$wgMediaViewerExtensions["stl"] = "mmv.3d"', - '$wgMediaViewerExtensions["amf"] = "mmv.3d"', ] } } diff --git a/puppet/modules/three_d/manifests/init.pp b/puppet/modules/three_d/manifests/init.pp index 82b329e..710d5a7 100644 --- a/puppet/modules/three_d/manifests/init.pp +++ b/puppet/modules/three_d/manifests/init.pp @@ -17,6 +17,7 @@ require_package('libglu1-mesa-dev') require_package('libglew-dev') require_package('libgif-dev') + require_package('libgl1-mesa-dri') file { $three_d_2png_dir: ensure => directory, -- To view, visit https://gerrit.wikimedia.org/r/350202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2bd6748151e7c3f889a10257b5093fd51b0e822 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
