From 7ef89acf8104626feae8be805b950242d98d3929 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Wed, 12 Jan 2011 12:04:14 -0800
Subject: [PATCH] added the redirect to the nginx conf

---
 app/uploaders/image_uploader.rb                        | 1 +
 chef/cookbooks/common/templates/default/nginx.conf.erb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 8ee8c9abd..5196cdcde 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -4,6 +4,7 @@
 
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
+  storage :s3
 
   def store_dir
     "uploads/images"
diff --git a/chef/cookbooks/common/templates/default/nginx.conf.erb b/chef/cookbooks/common/templates/default/nginx.conf.erb
index c06963b53..a8aa121ec 100644
--- a/chef/cookbooks/common/templates/default/nginx.conf.erb
+++ b/chef/cookbooks/common/templates/default/nginx.conf.erb
@@ -108,13 +108,14 @@ http {
      proxy_pass http://thin_cluster;
      break;
     }
+
+    rewrite ^/uploads/images/(.*)$ https://joindiaspora.s3.amazonaws.com/uploads/images/$1 permanent;
    }
 
    error_page 500 502 503 504 /50x.html;
    location = /50x.html {
     root html;
    }
-
 }
 
 }