From ddef8e13b39ea63b5199591b18dac36fee37ca60 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 17 Jul 2013 14:55:45 +0200 Subject: [PATCH] nginx --- config/deploy.rb | 2 +- config/nginx.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index 88542fc..45296d6 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -6,7 +6,7 @@ set :scm_user, "git" set :scm_host, "gitlab.bally.me" -set :domain, 'test.script-art.net' +set :domain, 'test.script-art.fr' set :rvm_ruby_string, 'ruby-2.0.0-p195' set :rvm_autolibs_flag, "read-only" diff --git a/config/nginx.conf b/config/nginx.conf index 64aa64d..b3c6262 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream danielle_app_unicorn { server { listen 80; - server_name test.script-art.net; + server_name test.script-art.fr; root /home/web/danielle_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -41,7 +41,7 @@ server { server { listen 80; - server_name test.script-art.fr; + server_name test.script-art.net; rewrite ^(.*) http://test.script-art.fr$1 permanent; }