diff --git a/config/deploy.rb b/config/deploy.rb index 185fbaf..2968a65 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -95,10 +95,17 @@ set :application, 'pic_vert_app' run "cd #{deploy_to}current && rake db:migrate RAILS_ENV=#{rails_env}" end + + task :nginx do + sudo "service nginx reload" + end + task :seeds do run "cd #{deploy_to}current && rake db:seed RAILS_ENV=#{rails_env}" end + + end \ No newline at end of file diff --git a/config/nginx.conf b/config/nginx.conf index de606b9..4f6ccd6 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream pic_vert_app_unicorn { server { listen 80; - server_name www2.lepicvert.asso.fr; + server_name www2.lepicvert.asso.fr lepicvert.org; root /home/web/pic_vert_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -20,3 +20,11 @@ server { keepalive_timeout 10; } + +server { + listen 80; + server_name www.lepicvert.org; + rewrite ^(.*) http://lepicvert.org$1 permanent; +} + +