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

url

Browse Source
This commit is contained in:
Nicolas Bally 2013-09-30 21:56:59 +02:00
parent f2846f7d54
commit c4d9303c5b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/deploy.rb
View File

@ -1,7 +1,7 @@
set :application, 'crossey_app' set :application, 'crossey_app'
set :domain, 'new.saint-etienne-de-crossey.fr' set :domain, 'new.st-etienne-de-crossey.fr'
set :user, 'web' set :user, 'web'
set :scm_user, "git" set :scm_user, "git"

2
config/environments/production.rb
View File

@ -83,7 +83,7 @@ CMSnb::Application.configure do
# Use default logging formatter so that PID and timestamp are not suppressed. # Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new 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 config.action_mailer.delivery_method = :sendmail

6
config/nginx.conf
View File

@ -4,7 +4,7 @@ upstream crossey_app_unicorn {
server { server {
listen 80; 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; root /home/web/crossey_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -23,6 +23,6 @@ server {
server { server {
listen 80; listen 80;
server_name saint-etienne-de-crossey.fr; server_name st-etienne-de-crossey.fr;
rewrite ^(.*) http://new.saint-etienne-de-crossey.fr$1 permanent; rewrite ^(.*) http://new.st-etienne-de-crossey.fr$1 permanent;
} }