jenkins-bot has submitted this change and it was merged.
Change subject: Add ability to purge originals cached by thumbor
......................................................................
Add ability to purge originals cached by thumbor
Bug: T111005
Change-Id: I00172f7c2ba20d8ff285dd1b1c8cda75cfd638ea
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/thumbor.conf.erb
M puppet/modules/thumbor/templates/upstart.erb
3 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: 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 bcd90b1..debb714 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -45,6 +45,8 @@
packages => [
'git+git://github.com/thumbor/thumbor.git',
'git+git://github.com/gi11es/thumbor-memcached.git',
+ 'git+git://github.com/thumbor-community/core',
+ 'git+https://gerrit.wikimedia.org/r/thumbor/purger',
'cv2',
'numpy',
'opencv-engine',
diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb
b/puppet/modules/thumbor/templates/thumbor.conf.erb
index 2ab0709..7ed75db 100644
--- a/puppet/modules/thumbor/templates/thumbor.conf.erb
+++ b/puppet/modules/thumbor/templates/thumbor.conf.erb
@@ -575,3 +575,10 @@
################################################################################
+################################## Extensions
##################################
+
+COMMUNITY_EXTENSIONS = [
+ 'tc_purger',
+]
+
+################################################################################
diff --git a/puppet/modules/thumbor/templates/upstart.erb
b/puppet/modules/thumbor/templates/upstart.erb
index 873477e..b8b5996 100644
--- a/puppet/modules/thumbor/templates/upstart.erb
+++ b/puppet/modules/thumbor/templates/upstart.erb
@@ -10,4 +10,4 @@
setuid www-data
setgid www-data
-exec <%= @deploy_dir %>/bin/thumbor -c <%= @cfg_file %>
\ No newline at end of file
+exec <%= @deploy_dir %>/bin/thumbor -c <%= @cfg_file %> -a tc_core.app.App
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/251316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00172f7c2ba20d8ff285dd1b1c8cda75cfd638ea
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
