Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/269760
Change subject: Make Thumbor use new ImageMagick engine
......................................................................
Make Thumbor use new ImageMagick engine
Bug: T125167
Change-Id: Ia186e8e5adb619d9e03313631501a3fd76d763ed
---
M puppet/modules/role/manifests/multimedia.pp
M puppet/modules/role/manifests/thumbor.pp
M puppet/modules/role/manifests/uploadwizard.pp
M puppet/modules/thumbor/templates/thumbor.conf.erb
4 files changed, 19 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/60/269760/1
diff --git a/puppet/modules/role/manifests/multimedia.pp
b/puppet/modules/role/manifests/multimedia.pp
index 684ec3f..2b6e453 100644
--- a/puppet/modules/role/manifests/multimedia.pp
+++ b/puppet/modules/role/manifests/multimedia.pp
@@ -11,6 +11,9 @@
class role::multimedia {
include ::role::thumb_on_404
+ require_package('imagemagick')
+ require_package('libimage-exiftool-perl')
+
# Increase PHP upload size from default puny 2MB
php::ini { 'uploadsize':
settings => {
@@ -20,12 +23,14 @@
}
mediawiki::settings { 'multimedia':
- values => {
- 'wgMaxImageArea' => 75e6,
- 'wgTiffMaxMetaSize' => 1048576,
- 'wgMaxAnimatedGifArea' => 75e6,
+ require => Package['imagemagick'],
+ values => {
+ # These are copied over from the Commons production configuration
+ wgMaxImageArea => 75e6,
+ wgTiffMaxMetaSize => 1048576,
+ wgMaxAnimatedGifArea => 75e6,
+ wgSharpenParameter => '0x0.8',
+ wgUseImageMagick => true,
}
}
-
- require_package('libimage-exiftool-perl')
}
diff --git a/puppet/modules/role/manifests/thumbor.pp
b/puppet/modules/role/manifests/thumbor.pp
index 03072e6..0d3453a 100644
--- a/puppet/modules/role/manifests/thumbor.pp
+++ b/puppet/modules/role/manifests/thumbor.pp
@@ -8,10 +8,11 @@
require ::role::memcached
require ::role::pagedtiffhandler
require ::role::pdfhandler
- include ::role::sentry
require ::role::swift
require ::role::timedmediahandler
- require ::role::thumb_on_404
+ require ::role::multimedia
+ require ::role::vipsscaler
+ include ::role::sentry
include ::apache::mod::proxy
include ::apache::mod::proxy_http
include ::apache::mod::headers
diff --git a/puppet/modules/role/manifests/uploadwizard.pp
b/puppet/modules/role/manifests/uploadwizard.pp
index 42c585a..45dd132 100644
--- a/puppet/modules/role/manifests/uploadwizard.pp
+++ b/puppet/modules/role/manifests/uploadwizard.pp
@@ -10,7 +10,6 @@
include ::role::titleblacklist
# API smoke test dependencies
- require_package('imagemagick')
require_package('python-imaging')
require_package('python-poster')
@@ -18,11 +17,9 @@
mediawiki::extension { 'UploadWizard':
browser_tests => true,
- require => Package['imagemagick'],
settings => {
wgAllowCopyUploads => true,
wgEnableUploads => true,
- wgUseImageMagick => true,
wgUploadNavigationUrl => '/wiki/Special:UploadWizard',
wgApiFrameOptions => 'SAMEORIGIN',
wgUploadWizardConfig => {
diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb
b/puppet/modules/thumbor/templates/thumbor.conf.erb
index c35684d..c0d892f 100644
--- a/puppet/modules/thumbor/templates/thumbor.conf.erb
+++ b/puppet/modules/thumbor/templates/thumbor.conf.erb
@@ -58,7 +58,7 @@
## Quality index used for generated JPEG images
## Defaults to: 80
-#QUALITY = 80
+QUALITY = 87
## Exports JPEG images with the `progressive` flag set.
## Defaults to: True
@@ -557,6 +557,9 @@
################################## Extensions
##################################
+QUALITY_LOW = 40
+DEFAULT_FILTERS_JPEG = 'conditional_sharpen(0.6,0.01,false,0.85)'
+
COMMUNITY_EXTENSIONS = [
'wikimedia_thumbor.handler.multi'
]
@@ -591,6 +594,7 @@
'wikimedia_thumbor.engine.djvu',
'wikimedia_thumbor.engine.vips',
'wikimedia_thumbor.engine.tiff',
+ 'wikimedia_thumbor.engine.imagemagick',
'thumbor.engines.pil'
]
--
To view, visit https://gerrit.wikimedia.org/r/269760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia186e8e5adb619d9e03313631501a3fd76d763ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
