Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/237042
Change subject: Support archived thumbnails in thumbor role ...................................................................... Support archived thumbnails in thumbor role Bug: T111725 Change-Id: I4cb16b594e923f8381755d4b0e7acba7db823269 --- M puppet/modules/role/templates/thumbor/apache2.conf.erb 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/42/237042/1 diff --git a/puppet/modules/role/templates/thumbor/apache2.conf.erb b/puppet/modules/role/templates/thumbor/apache2.conf.erb index b6ee447..ec8aea6 100644 --- a/puppet/modules/role/templates/thumbor/apache2.conf.erb +++ b/puppet/modules/role/templates/thumbor/apache2.conf.erb @@ -1,7 +1,7 @@ <Directory <%= @images_dir %>> RewriteEngine on RewriteBase "/images/" -RewriteRule "^thumb/(\w+)/(\w+)/.*/qlow-(\d+)px-(.*\.jpg)" "http://127.0.0.1:8888/unsafe/$3x/filters:quality(40):sharpen(0.6,0.01,false)/<%= @server_url %>/images/$1/$2/$4" [P] -RewriteRule "^thumb/(\w+)/(\w+)/.*/(\d+)px-(.*\.jpg)" "http://127.0.0.1:8888/unsafe/$3x/filters:quality(87):sharpen(0.6,0.01,false)/<%= @server_url %>/images/$1/$2/$4" [P] -RewriteRule "^thumb/(\w+)/(\w+)/.*/(\d+)px-(.*\.png)" "http://127.0.0.1:8888/unsafe/$3x/<%= @server_url %>/images/$1/$2/$4" [P] +RewriteRule "^thumb/(.*)/qlow-(\d+)px-.*\.jpg" "http://127.0.0.1:8888/unsafe/$2x/filters:quality(40):sharpen(0.6,0.01,false)/<%= @server_url %>/images/$1" [P] +RewriteRule "^thumb/(.*)/(\d+)px-.*\.jpg" "http://127.0.0.1:8888/unsafe/$2x/filters:quality(87):sharpen(0.6,0.01,false)/<%= @server_url %>/images/$1" [P] +RewriteRule "^thumb/(.*)/(\d+)px-.*\.png" "http://127.0.0.1:8888/unsafe/$2x/<%= @server_url %>/images/$1" [P] </Directory> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/237042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cb16b594e923f8381755d4b0e7acba7db823269 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
