This commit is contained in:
Nico 2013-02-13 00:13:03 +01:00
parent 2f38d579cd
commit 4caf239b61
3 changed files with 77 additions and 78 deletions

View File

@ -1,6 +1,5 @@
set :application, 'site_perso_app'
set :domain, 'new.nicolasbally.com'
set :application, 'ecole_eft_app'
set :domain, 'new.ecole-eft-france.fr'

View File

@ -1,18 +1,18 @@
upstream site_perso_app_unicorn {
server unix:/home/web/site_perso_app/shared/tmp/unicorn.sock fail_timeout=0;
upstream ecole_eft_app_unicorn {
server unix:/home/web/ecole_eft_app/shared/tmp/unicorn.sock fail_timeout=0;
}
server {
listen 80;
server_name new.nicolasbally.com art.nicolasbally.com;
root /home/web/site_perso_app/current/public;
server_name ecole-eft-france.fr;
root /home/web/ecole_eft_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://site_perso_app_unicorn;
proxy_pass http://ecole_eft_app_unicorn;
}
error_page 500 502 503 504 /500.html;
@ -22,6 +22,6 @@ server {
server {
listen 80;
server_name www.cliche-nature.com cliche-nature.com www.nicolasbally.com nicolasbally.com www.art.nicolasbally.com;
rewrite ^(.*) http://art.nicolasbally.com$1 permanent;
server_name www.ecole-eft-france.fr;
rewrite ^(.*) http://ecole-eft-france.fr$1 permanent;
}

View File

@ -1,4 +1,4 @@
@rails_app = "site_perso_app"
@rails_app = "ecole_eft_app"
working_directory "/home/web/#{@rails_app}/current"
pid "/home/web/#{@rails_app}/shared/unicorn.pid"