diff --git a/config/deploy.rb b/config/deploy.rb index 5ce2154..0457398 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,7 +1,7 @@ set :application, 'crossey_app' - set :domain, 'new.saint-etienne-de-crossey.fr' + set :domain, 'new.st-etienne-de-crossey.fr' set :user, 'web' set :scm_user, "git" diff --git a/config/environments/production.rb b/config/environments/production.rb index 9681809..ed1bed5 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -83,7 +83,7 @@ CMSnb::Application.configure do # Use default logging formatter so that PID and timestamp are not suppressed. config.log_formatter = ::Logger::Formatter.new - config.action_mailer.default_url_options = { :host => "http://new.saint-etienne-de-crossey.fr" } + config.action_mailer.default_url_options = { :host => "http://new.st-etienne-de-crossey.fr" } config.action_mailer.delivery_method = :sendmail diff --git a/config/nginx.conf b/config/nginx.conf index 0e84da1..26854cc 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream crossey_app_unicorn { server { listen 80; - server_name new.saint-etienne-de-crossey.fr; + server_name new.st-etienne-de-crossey.fr; root /home/web/crossey_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -23,6 +23,6 @@ server { server { listen 80; - server_name saint-etienne-de-crossey.fr; - rewrite ^(.*) http://new.saint-etienne-de-crossey.fr$1 permanent; + server_name st-etienne-de-crossey.fr; + rewrite ^(.*) http://new.st-etienne-de-crossey.fr$1 permanent; }