jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372164 )
Change subject: Enable Thumbor 3D/STL support ...................................................................... Enable Thumbor 3D/STL support Bug: T161719 Change-Id: Ib9b29350ffb5c8397c75b66f2332f9d63aab42c6 --- M puppet/hieradata/common.yaml M puppet/modules/role/manifests/thumbor.pp M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb 3 files changed, 8 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Gilles: Looks good to me, approved diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 69289d3..016ffbd 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -11,7 +11,7 @@ mwv::tld: '.local.wmftest.net' mwv::cachefilesd::enable: true -three_d::three_d_2png_dir: /var/3d2png +three_d::three_d_2png_dir: /srv/3d2png apache::docroot: /var/www arcanist::deploy_dir: "%{hiera('mwv::services_dir')}" diff --git a/puppet/modules/role/manifests/thumbor.pp b/puppet/modules/role/manifests/thumbor.pp index 62dfd20..20c3ef1 100644 --- a/puppet/modules/role/manifests/thumbor.pp +++ b/puppet/modules/role/manifests/thumbor.pp @@ -10,6 +10,7 @@ require ::role::pdfhandler require ::role::poolcounter require ::role::swift + require ::role::three_d require ::role::timedmediahandler require ::role::multimedia require ::role::vipsscaler @@ -58,6 +59,7 @@ 'webm', 'djvu', 'pdf', + 'stl', 'tiff', 'tif', 'webp', diff --git a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb index d12b5f4..0934735 100644 --- a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb +++ b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb @@ -30,6 +30,10 @@ CONVERT_PATH = '/usr/bin/convert' +THREED2PNG_PATH = '<%= scope['::three_d::three_d_2png_dir'] %>/3d2png.js' + +XVFB_RUN_PATH = '/usr/bin/xvfb-run' + SWIFT_HOST = 'http://127.0.0.1:<%= scope['::swift::port'] %>' SWIFT_API_PATH = '/v1/AUTH_<%= scope['::swift::project'] %>' SWIFT_AUTH_PATH = '/auth/v1.0' @@ -48,6 +52,7 @@ PROXY_ENGINE_ENGINES = [ ('wikimedia_thumbor.engine.svg', ['svg']), ('wikimedia_thumbor.engine.gif', ['gif']), + ('wikimedia_thumbor.engine.stl', ['stl']), ('wikimedia_thumbor.engine.xcf', ['xcf']), ('wikimedia_thumbor.engine.djvu', ['djvu']), ('wikimedia_thumbor.engine.vips', ['tiff', 'png']), -- To view, visit https://gerrit.wikimedia.org/r/372164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9b29350ffb5c8397c75b66f2332f9d63aab42c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits