diff --git a/config/nginx.conf b/config/nginx.conf index f200d70..b42e403 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -2,27 +2,10 @@ upstream new_ads_app_unicorn { server unix:/home/web/new_ads_app/shared/unicorn.sock fail_timeout=0; } -server { - listen 80; - server_name artdessens.fr; - root /home/web/new_ads_app/current/public; - try_files $uri/index.html $uri @unicorn; - location @unicorn { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://new_ads_app_unicorn; - proxy_read_timeout 6000; - } - - error_page 500 502 503 504 /500.html; - client_max_body_size 4G; - keepalive_timeout 10; -} server { listen 80; - server_name www.artdessens.fr new.artdessens.fr; - rewrite ^(.*) http://artdessens.fr$1 permanent; + server_name www.artdessens.fr new.artdessens.fr artdessens.fr; + rewrite ^(.*) http://cris-graphic.com/ permanent; }