nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added the redirect to the nginx conf

Browse source
This commit is contained in:
zhitomirskiyi 2011-01-12 12:04:14 -08:00
parent 0f9dc4954a
commit 7ef89acf81
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/uploaders/image_uploader.rb
View file

@ -4,6 +4,7 @@
class ImageUploader < CarrierWave::Uploader::Base class ImageUploader < CarrierWave::Uploader::Base
include CarrierWave::MiniMagick include CarrierWave::MiniMagick
storage :s3
def store_dir def store_dir
"uploads/images" "uploads/images"

3
chef/cookbooks/common/templates/default/nginx.conf.erb
View file

@ -108,13 +108,14 @@ http {
proxy_pass http://thin_cluster; proxy_pass http://thin_cluster;
break; break;
} }
rewrite ^/uploads/images/(.*)$ https://joindiaspora.s3.amazonaws.com/uploads/images/$1 permanent;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;
location = /50x.html { location = /50x.html {
root html; root html;
} }
} }
} }