nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

routes & nginx prod

Browse Source
This commit is contained in:
Nicolas Bally 2015-11-18 10:03:10 +01:00
parent 00cf14ce44
commit a179089ffc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/nginx.conf
View File

@ -4,7 +4,7 @@ upstream pic_vert_app_unicorn {
server { server {
listen 80; listen 80;
server_name new2.lepicvert.org new.lepicvert.org lepicvert.org; server_name lepicvert.org;
root /home/web/pic_vert_app/current/public; root /home/web/pic_vert_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -24,7 +24,7 @@ server {
server { server {
listen 80; 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; rewrite ^(.*) http://lepicvert.org$1 permanent;
} }

2
config/routes.rb
View File

@ -251,7 +251,7 @@ Survey::Application.routes.draw do
get '*url.:f' => 'public/menu_items#redirect', :f => "html" 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 end