From a179089ffc784c7667612b381bf9d54a9a46bfb6 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 18 Nov 2015 10:03:10 +0100 Subject: [PATCH] routes & nginx prod --- config/nginx.conf | 4 ++-- config/routes.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/nginx.conf b/config/nginx.conf index 4e24cad..28b4f06 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream pic_vert_app_unicorn { server { listen 80; - server_name new2.lepicvert.org new.lepicvert.org lepicvert.org; + server_name lepicvert.org; root /home/web/pic_vert_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -24,7 +24,7 @@ server { server { listen 80; - server_name www.lepicvert.org; + server_name www.lepicvert.org new2.lepicvert.org new.lepicvert.org www.lepicvert.asso.fr lepicvert.asso.fr; rewrite ^(.*) http://lepicvert.org$1 permanent; } diff --git a/config/routes.rb b/config/routes.rb index 1c04fff..9c4b980 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -251,7 +251,7 @@ Survey::Application.routes.draw do get '*url.:f' => 'public/menu_items#redirect', :f => "html" - root 'public/menu_items#show' ,:constraints => {:domain => ["lepicvert.org"], :subdomain => ["new"]} + root 'public/menu_items#show' ,:constraints => {:domain => ["lepicvert.org"]} end