diff --git a/.DS_Store b/.DS_Store index 3cb399d..5abbb66 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/config/nginx.conf b/config/nginx.conf index ed485d8..e0e5b65 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream new_ads_app_unicorn { server { listen 80; - server_name new.artdessens.fr; + server_name artdessens.fr; root /home/web/new_ads_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -21,3 +21,8 @@ server { keepalive_timeout 10; } +server { + listen 80; + server_name www.artdessens.fr new.artdessens.fr; + rewrite ^(.*) http://cris-graphic.com$1 permanent; +} diff --git a/public/.DS_Store b/public/.DS_Store index 0623420..e033e22 100644 Binary files a/public/.DS_Store and b/public/.DS_Store differ