From fd8a842bfa4644898626a4b800b6f6b4858d10ea Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Tue, 19 Mar 2013 11:27:05 +0100
Subject: [PATCH] timeout

---
 config/nginx.conf | 1 +
 config/unicorn.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/nginx.conf b/config/nginx.conf
index 4f6ccd6..1d49cf5 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -13,6 +13,7 @@ server {
 		proxy_set_header Host $http_host;
 		proxy_redirect off;
 		proxy_pass http://pic_vert_app_unicorn;
+		proxy_read_timeout 6000;
 	}
 
 	error_page 500 502 503 504 /500.html;
diff --git a/config/unicorn.rb b/config/unicorn.rb
index c8c4e8f..422ef0e 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -8,4 +8,4 @@ stdout_path "/home/web/#{@rails_app}/shared/log/unicorn.log"
 
 listen "/home/web/#{@rails_app}/shared/tmp/unicorn.sock"
 worker_processes 2
-timeout 30
+timeout 600