jenkins-bot has submitted this change and it was merged.
Change subject: Point to new phabricator repo
......................................................................
Point to new phabricator repo
Bug: T120208
Change-Id: I67b36ad7343552e3b3a2406a8d31e38920ec13da
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/thumbor.conf.erb
2 files changed, 24 insertions(+), 30 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index 994bdcc..8241b44 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -79,22 +79,9 @@
'numpy',
'opencv-engine',
'raven',
- 'pylibmc', # For memcache original file storage
'git+git://github.com/gi11es/thumbor.git',
- 'git+git://github.com/gi11es/thumbor-memcached.git',
'git+git://github.com/thumbor-community/core',
- 'git+https://gerrit.wikimedia.org/r/thumbor/conditional-sharpen',
- 'git+https://gerrit.wikimedia.org/r/thumbor/page',
- 'git+https://gerrit.wikimedia.org/r/thumbor/purger',
- 'git+https://gerrit.wikimedia.org/r/thumbor/exif-optimizer',
- 'git+https://gerrit.wikimedia.org/r/thumbor/proxy-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/base-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/svg-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/video-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/xcf-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/tiff-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/djvu-engine',
- 'git+https://gerrit.wikimedia.org/r/thumbor/ghostscript-engine',
+
'git+https://phabricator.wikimedia.org/diffusion/THMBREXT/thumbor-plugins.git',
],
require => [
Package['libjpeg-progs'],
diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb
b/puppet/modules/thumbor/templates/thumbor.conf.erb
index 7ec4e2a..c35684d 100644
--- a/puppet/modules/thumbor/templates/thumbor.conf.erb
+++ b/puppet/modules/thumbor/templates/thumbor.conf.erb
@@ -133,22 +133,22 @@
## The loader thumbor should use to load the original image. This must be the
## full name of a python module (python must be able to import it)
## Defaults to: thumbor.loaders.http_loader
-#LOADER = 'thumbor.loaders.http_loader'
+LOADER = 'wikimedia_thumbor.loader.proxy'
## The file storage thumbor should use to store original images. This must be
the
## full name of a python module (python must be able to import it)
## Defaults to: thumbor.storages.file_storage
-STORAGE = 'thumbor_memcached.storage'
+STORAGE = 'wikimedia_thumbor.storage.request'
## The result storage thumbor should use to store generated images. This must
be
## the full name of a python module (python must be able to import it)
## Defaults to: None
-RESULT_STORAGE = 'wikimedia_thumbor_result_storage'
+#RESULT_STORAGE = None
## The imaging engine thumbor should use to perform image operations. This must
## be the full name of a python module (python must be able to import it)
## Defaults to: thumbor.engines.pil
-ENGINE = 'wikimedia_thumbor_proxy_engine'
+ENGINE = 'wikimedia_thumbor.engine.proxy'
## The gif engine thumbor should use to perform image operations. This must be
## the full name of a python module (python must be able to import it)
@@ -253,7 +253,7 @@
## The filename of CA certificates in PEM format
## Defaults to: None
-#HTTP_LOADER_CA_CERTS = None
+HTTP_LOADER_CA_CERTS = '/etc/ssl/certs/ca-certificates.crt'
## The filename for client SSL key
## Defaults to: None
@@ -295,7 +295,7 @@
## Max size in Kb for images uploaded to thumbor
## Aliases: MAX_SIZE
## Defaults to: 0
-#UPLOAD_MAX_SIZE = 0
+UPLOAD_MAX_SIZE = 1048576 # 1GB
## Indicates whether thumbor should enable File uploads
## Aliases: ENABLE_ORIGINAL_PHOTO_UPLOAD
@@ -434,7 +434,7 @@
## List of optimizers that thumbor will use to optimize images
## Defaults to: []
OPTIMIZERS = [
- 'wikimedia_thumbor_exif_optimizer',
+ 'wikimedia_thumbor.optimizer.exif',
]
@@ -456,8 +456,8 @@
## it)
## Defaults to: ['thumbor.filters.brightness', 'thumbor.filters.colorize',
'thumbor.filters.contrast', 'thumbor.filters.rgb',
'thumbor.filters.round_corner', 'thumbor.filters.quality',
'thumbor.filters.noise', 'thumbor.filters.watermark',
'thumbor.filters.equalize', 'thumbor.filters.fill', 'thumbor.filters.sharpen',
'thumbor.filters.strip_icc', 'thumbor.filters.frame',
'thumbor.filters.grayscale', 'thumbor.filters.rotate',
'thumbor.filters.format', 'thumbor.filters.max_bytes',
'thumbor.filters.convolution', 'thumbor.filters.blur',
'thumbor.filters.extract_focal', 'thumbor.filters.no_upscale',
'thumbor.filters.saturation', 'thumbor.filters.max_age',
'thumbor.filters.curve']
FILTERS = [
- 'wikimedia_thumbor_conditional_sharpen',
- 'wikimedia_thumbor_page',
+ 'wikimedia_thumbor.filter.conditional_sharpen',
+ 'wikimedia_thumbor.filter.page',
'thumbor.filters.quality'
]
@@ -558,7 +558,7 @@
################################## Extensions
##################################
COMMUNITY_EXTENSIONS = [
- 'tc_purger',
+ 'wikimedia_thumbor.handler.multi'
]
EXIFTOOL_PATH = '/usr/bin/exiftool'
@@ -571,6 +571,8 @@
SUBPROCESS_CGEXEC_PATH = '/usr/bin/cgexec'
SUBPROCESS_CGROUP = 'memory:thumbor'
+VIPS_ENGINE_MIN_PIXELS = 0
+
RSVG_CONVERT_PATH = '/usr/bin/rsvg-convert'
FFPROBE_PATH = '/usr/bin/ffprobe'
@@ -581,14 +583,19 @@
GHOSTSCRIPT_PATH = '/usr/bin/gs'
+VIPS_PATH = '/usr/bin/vips'
+
PROXY_ENGINE_ENGINES = [
- 'wikimedia_thumbor_svg_engine',
- 'wikimedia_thumbor_video_engine',
- 'wikimedia_thumbor_xcf_engine',
- 'wikimedia_thumbor_djvu_engine',
- 'wikimedia_thumbor_ghostscript_engine',
- 'wikimedia_thumbor_tiff_engine',
+ 'wikimedia_thumbor.engine.svg',
+ 'wikimedia_thumbor.engine.xcf',
+ 'wikimedia_thumbor.engine.djvu',
+ 'wikimedia_thumbor.engine.vips',
+ 'wikimedia_thumbor.engine.tiff',
'thumbor.engines.pil'
]
+PROXY_LOADER_LOADERS = [
+ 'wikimedia_thumbor.loader.video'
+]
+
################################################################################
--
To view, visit https://gerrit.wikimedia.org/r/264083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67b36ad7343552e3b3a2406a8d31e38920ec13da
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[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
