[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add Thumbor config values moved out of package

2016-09-20 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: Add Thumbor config values moved out of package
..


Add Thumbor config values moved out of package

The 0.1.21 package upgrade moves these config values
out of 40-wikimedia.conf. It makes more sense to
define them in puppet.

Change-Id: I4318fae50e51303df3b93fbd7694bfa9a1e95129
---
M modules/thumbor/templates/server.conf.erb
1 file changed, 34 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/thumbor/templates/server.conf.erb 
b/modules/thumbor/templates/server.conf.erb
index 325e053..74004d3 100644
--- a/modules/thumbor/templates/server.conf.erb
+++ b/modules/thumbor/templates/server.conf.erb
@@ -98,5 +98,39 @@
 
 ### Wikimedia 
##
 
+EXIF_FIELDS_TO_KEEP = [ 'Artist', 'Copyright', 'Description' ]
 EXIF_TINYRGB_PATH = '/usr/local/lib/thumbor/tinyrgb.icc'
 EXIF_TINYRGB_ICC_REPLACE = 'sRGB IEC61966-2.1'
+
+PROXY_ENGINE_ENGINES = [
+('wikimedia_thumbor.engine.svg', ['svg']),
+('wikimedia_thumbor.engine.xcf', ['xcf']),
+('wikimedia_thumbor.engine.djvu', ['djvu']),
+('wikimedia_thumbor.engine.vips', ['tiff', 'png']),
+('wikimedia_thumbor.engine.tiff', ['tiff']),
+('wikimedia_thumbor.engine.ghostscript', ['pdf']),
+('wikimedia_thumbor.engine.imagemagick', ['jpg', 'png']),
+]
+
+HTTP_LOADER_MAX_BODY_SIZE = 1024*1024*1024  # 1GB
+
+PROXY_LOADER_LOADERS = [
+'wikimedia_thumbor.loader.video',
+'wikimedia_thumbor.loader.https'
+]
+
+COMMUNITY_EXTENSIONS = [
+'wikimedia_thumbor.handler.multi',
+'wikimedia_thumbor.handler.images'
+]
+
+SLOW_PROCESSING_LIMIT = 3
+
+SUBPROCESS_USE_TIMEOUT = True
+SUBPROCESS_TIMEOUT = 60
+
+VIPS_ENGINE_MIN_PIXELS = 1000
+
+CHROMA_SUBSAMPLING = '4:2:0'
+QUALITY_LOW = 40
+DEFAULT_FILTERS_JPEG = 'conditional_sharpen(0.0,0.8,1.0,0.0,0.85)'

-- 
To view, visit https://gerrit.wikimedia.org/r/311670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4318fae50e51303df3b93fbd7694bfa9a1e95129
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add Thumbor config values moved out of package

2016-09-20 Thread Gilles (Code Review) 
Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311670

Change subject: Add Thumbor config values moved out of package
..

Add Thumbor config values moved out of package

The 0.1.21 package upgrade moves these config values
out of 40-wikimedia.conf. It makes more sense to
define them in puppet.

Change-Id: I4318fae50e51303df3b93fbd7694bfa9a1e95129
---
M modules/thumbor/templates/server.conf.erb
1 file changed, 34 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/311670/1

diff --git a/modules/thumbor/templates/server.conf.erb 
b/modules/thumbor/templates/server.conf.erb
index 325e053..74004d3 100644
--- a/modules/thumbor/templates/server.conf.erb
+++ b/modules/thumbor/templates/server.conf.erb
@@ -98,5 +98,39 @@
 
 ### Wikimedia 
##
 
+EXIF_FIELDS_TO_KEEP = [ 'Artist', 'Copyright', 'Description' ]
 EXIF_TINYRGB_PATH = '/usr/local/lib/thumbor/tinyrgb.icc'
 EXIF_TINYRGB_ICC_REPLACE = 'sRGB IEC61966-2.1'
+
+PROXY_ENGINE_ENGINES = [
+('wikimedia_thumbor.engine.svg', ['svg']),
+('wikimedia_thumbor.engine.xcf', ['xcf']),
+('wikimedia_thumbor.engine.djvu', ['djvu']),
+('wikimedia_thumbor.engine.vips', ['tiff', 'png']),
+('wikimedia_thumbor.engine.tiff', ['tiff']),
+('wikimedia_thumbor.engine.ghostscript', ['pdf']),
+('wikimedia_thumbor.engine.imagemagick', ['jpg', 'png']),
+]
+
+HTTP_LOADER_MAX_BODY_SIZE = 1024*1024*1024  # 1GB
+
+PROXY_LOADER_LOADERS = [
+'wikimedia_thumbor.loader.video',
+'wikimedia_thumbor.loader.https'
+]
+
+COMMUNITY_EXTENSIONS = [
+'wikimedia_thumbor.handler.multi',
+'wikimedia_thumbor.handler.images'
+]
+
+SLOW_PROCESSING_LIMIT = 3
+
+SUBPROCESS_USE_TIMEOUT = True
+SUBPROCESS_TIMEOUT = 60
+
+VIPS_ENGINE_MIN_PIXELS = 1000
+
+CHROMA_SUBSAMPLING = '4:2:0'
+QUALITY_LOW = 40
+DEFAULT_FILTERS_JPEG = 'conditional_sharpen(0.0,0.8,1.0,0.0,0.85)'

-- 
To view, visit https://gerrit.wikimedia.org/r/311670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4318fae50e51303df3b93fbd7694bfa9a1e95129
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits