diff --git a/Gemfile b/Gemfile index 26df947..b18152f 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ group :development, :test do #gem 'capistrano-rails' #gem "rvm-capistrano" - gem "capistrano", '2.15.5', group: :development, require: false + gem "capistrano", '2.15.9', group: :development, require: false gem "rvm-capistrano",'1.4.1', group: :development gem 'net-ssh', '~>2.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index b7122ff..52791d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM builder (3.2.2) byebug (5.0.0) columnize (= 0.9.0) - capistrano (2.15.5) + capistrano (2.15.9) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -215,7 +215,7 @@ DEPENDENCIES acts_as_tree bcrypt (~> 3.1.7) byebug - capistrano (= 2.15.5) + capistrano (= 2.15.9) carrierwave coffee-rails (~> 4.1.0) formtastic (= 2.3.0) diff --git a/config/nginx.conf b/config/nginx.conf index cbcbe87..f2d2717 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,11 +1,11 @@ upstream blog_perso_app_unicorn { - server unix:/home/web/blog_perso_app/shared/unicorn.sock fail_timeout=0; + server unix:/srv/www/web/blog_perso_app/shared/unicorn.sock fail_timeout=0; } server { listen [::]:80; server_name blog.nicolasbally.com; - root /home/web/blog_perso_app/current/public; + root /srv/www/web/blog_perso_app/current/public; try_files $uri/index.html $uri @unicorn; location @unicorn {