Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/259640
Change subject: Configure thumbor subprocess limits ...................................................................... Configure thumbor subprocess limits Bug: T120940 Change-Id: I95ce526c535fccb508e3a48cd83ddf58da8e6181 --- M puppet/modules/role/settings/thumbor.yaml M puppet/modules/thumbor/manifests/init.pp M puppet/modules/thumbor/templates/thumbor.conf.erb 3 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/40/259640/1 diff --git a/puppet/modules/role/settings/thumbor.yaml b/puppet/modules/role/settings/thumbor.yaml index 46a23c4..591265e 100644 --- a/puppet/modules/role/settings/thumbor.yaml +++ b/puppet/modules/role/settings/thumbor.yaml @@ -1,3 +1,4 @@ +vagrant_ram: 2048 forward_ports: 8888: 8888 # thumbor 6081: 6081 # varnish diff --git a/puppet/modules/thumbor/manifests/init.pp b/puppet/modules/thumbor/manifests/init.pp index d1fb138..1edcda1 100644 --- a/puppet/modules/thumbor/manifests/init.pp +++ b/puppet/modules/thumbor/manifests/init.pp @@ -3,9 +3,7 @@ # This Puppet class installs and configures a Thumbor instance # # Thumbor is installed as a Python package, and as part of that, -# pip compiles lxml. This is memory-intensive; you might have to -# increase the memory available to the VM with something like -# 'vagrant config vagrant_ram 2048; vagrant reload'. +# pip compiles lxml. # # === Parameters # diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb b/puppet/modules/thumbor/templates/thumbor.conf.erb index 2b9ee7d..d6c19b4 100644 --- a/puppet/modules/thumbor/templates/thumbor.conf.erb +++ b/puppet/modules/thumbor/templates/thumbor.conf.erb @@ -587,6 +587,11 @@ EXIF_TINYRGB_PATH = '/srv/thumbor/tinyrgb.icc' EXIF_TINYRGB_ICC_REPLACE = 'IEC 61966-2.1 Default RGB colour space - sRGB' +SUBPROCESS_TIMEOUT_PATH = '/usr/bin/timeout' +SUBPROCESS_TIMEOUT = 60 +SUBPROCESS_CGEXEC_PATH = '/usr/bin/cgexec' +SUBPROCESS_CGROUP = 'thumbor' + PROXY_ENGINE_ENGINES = [ 'thumbor.engines.pil' ] ################################################################################ -- To view, visit https://gerrit.wikimedia.org/r/259640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95ce526c535fccb508e3a48cd83ddf58da8e6181 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
