Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/375781 )
Change subject: Add STL support to Thumbor, behind flag
......................................................................
Add STL support to Thumbor, behind flag
3d2png is only deployed on Beta for now, which is why
this needs to be conditional until it's deployed to
production as well.
Bug: T161719
Change-Id: I9684adbf676938936471288a1dca723362be7229
---
M modules/thumbor/manifests/init.pp
M modules/thumbor/templates/server.conf.erb
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/375781/1
diff --git a/modules/thumbor/manifests/init.pp
b/modules/thumbor/manifests/init.pp
index fde4eca..888863b 100644
--- a/modules/thumbor/manifests/init.pp
+++ b/modules/thumbor/manifests/init.pp
@@ -19,6 +19,12 @@
# [*statsd_prefix*]
# Prefix to use when sending statistics.
#
+# [*poolcounter_server*]
+# Address of poolcounter server, if any.
+#
+# [*stl_support*]
+# Whether STL support should be enabled.
+#
class thumbor (
$listen_port = 8800,
@@ -27,6 +33,7 @@
$statsd_port = '8125',
$statsd_prefix = "thumbor.${::hostname}",
$poolcounter_server = undef,
+ $stl_support = undef,
) {
requires_os('debian >= jessie')
diff --git a/modules/thumbor/templates/server.conf.erb
b/modules/thumbor/templates/server.conf.erb
index b2157ad..2f86463 100644
--- a/modules/thumbor/templates/server.conf.erb
+++ b/modules/thumbor/templates/server.conf.erb
@@ -98,6 +98,9 @@
PROXY_ENGINE_ENGINES = [
('wikimedia_thumbor.engine.svg', ['svg']),
+<%- if @stl_support != nil -%>
+ ('wikimedia_thumbor.engine.stl', ['stl']),
+<% end %>
('wikimedia_thumbor.engine.xcf', ['xcf']),
('wikimedia_thumbor.engine.djvu', ['djvu']),
('wikimedia_thumbor.engine.vips', ['tiff', 'png']),
@@ -182,6 +185,10 @@
FAILURE_THROTTLING_DURATION = 3600
FAILURE_THROTTLING_PREFIX = 'thumbor-failure-'
+<%- if @stl_support != nil -%>
+THREED2PNG_PATH = '/srv/deployment/3d2png/deploy/src/3d2png.js'
+<% end %>
+
################################### Logging ##################################
--
To view, visit https://gerrit.wikimedia.org/r/375781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9684adbf676938936471288a1dca723362be7229
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
