Merge branch 'nginx-config-tweaks' into rails-3-develop

2 files changed, 5 insertions, 3 deletions

diff --git a/config/nginx-ssl.conf.example b/config/nginx-ssl.conf.example
index c623c8e96..478916de7 100644
--- a/config/nginx-ssl.conf.example
+++ b/config/nginx-ssl.conf.example
@@ -14,6 +14,11 @@ server {
     access_log /var/log/nginx/alaveteli_ssl_access.log;
     error_log /var/log/nginx/alaveteli_ssl_error.log error;
 
+    location /download {
+        internal;
+        alias /var/www/alaveteli/alaveteli/cache/zips/production/download;
+    }
+
     ssl on;
     ssl_certificate /etc/ssl/certs/www.example.com.cert;
     ssl_certificate_key /etc/ssl/private/www.example.com.key;
diff --git a/config/nginx.conf.example b/config/nginx.conf.example
index be937b7fd..7b8af2bd9 100644
--- a/config/nginx.conf.example
+++ b/config/nginx.conf.example
@@ -24,9 +24,6 @@ server {
 
     try_files $uri/index.html $uri @alaveteli;
 
-    error_page 500 502 503 504 /500.html;
-    error_page 404             /404.html;
-    error_page 422             /422.html;
 
     location /download {
         internal;