jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364234 )
Change subject: Make Thumbor GIF engine configuration match production
......................................................................
Make Thumbor GIF engine configuration match production
Bug: T169687
Change-Id: I40243643e29182cc8db567682ddca2abf91427b6
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/10-thumbor.conf.erb
M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Gilles: Looks good to me, approved
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index a4b383f..b835b32 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -113,7 +113,7 @@
],
}
- file { "${cfg_dir}/20-thumbor-wikimedia.conf":
+ file { "${cfg_dir}/60-thumbor-wikimedia.conf":
ensure => present,
group => 'thumbor',
content => template('thumbor/20-thumbor-wikimedia.conf.erb'),
@@ -133,7 +133,7 @@
cfg_files => File[
"${cfg_dir}/10-thumbor.conf",
"${cfg_dir}/20-thumbor-logging.conf",
- "${cfg_dir}/20-thumbor-wikimedia.conf"
+ "${cfg_dir}/60-thumbor-wikimedia.conf"
],
}
diff --git a/puppet/modules/thumbor/templates/10-thumbor.conf.erb
b/puppet/modules/thumbor/templates/10-thumbor.conf.erb
index 2ed455b..420d62e 100644
--- a/puppet/modules/thumbor/templates/10-thumbor.conf.erb
+++ b/puppet/modules/thumbor/templates/10-thumbor.conf.erb
@@ -112,7 +112,7 @@
## cropping and filters are not supported for gifs using gifsicle (but won't
## give an error).
## Defaults to: False
-USE_GIFSICLE_ENGINE = True
+#USE_GIFSICLE_ENGINE = False
## Indicates whether thumbor should enable blacklist functionality to prevent
## processing certain images.
diff --git a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
index 173bd1c..d12b5f4 100644
--- a/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
+++ b/puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb
@@ -47,6 +47,7 @@
PROXY_ENGINE_ENGINES = [
('wikimedia_thumbor.engine.svg', ['svg']),
+ ('wikimedia_thumbor.engine.gif', ['gif']),
('wikimedia_thumbor.engine.xcf', ['xcf']),
('wikimedia_thumbor.engine.djvu', ['djvu']),
('wikimedia_thumbor.engine.vips', ['tiff', 'png']),
@@ -106,6 +107,6 @@
# Thumbnails that fail for a given xkey more than 4 times per hour aren't
# worth re-attempting that often
FAILURE_THROTTLING_MEMCACHE = ['127.0.0.1:<%= scope['::memcached::port'] %>']
-FAILURE_THROTTLING_MAX = 4
+FAILURE_THROTTLING_MAX = 10
FAILURE_THROTTLING_DURATION = 3600
FAILURE_THROTTLING_PREFIX = 'thumbor-failure-'
--
To view, visit https://gerrit.wikimedia.org/r/364234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40243643e29182cc8db567682ddca2abf91427b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
