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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2018-03-14 02:28:30 +01:00
parent 98ab1e3e07
commit 346884c3d4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -35,7 +35,7 @@ group :development, :test do
#gem 'capistrano-rails' #gem 'capistrano-rails'
#gem "rvm-capistrano" #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 "rvm-capistrano",'1.4.1', group: :development
gem 'net-ssh', '~>2.7.0' gem 'net-ssh', '~>2.7.0'

4
Gemfile.lock
View File

@ -46,7 +46,7 @@ GEM
builder (3.2.2) builder (3.2.2)
byebug (5.0.0) byebug (5.0.0)
columnize (= 0.9.0) columnize (= 0.9.0)
capistrano (2.15.5) capistrano (2.15.9)
highline highline
net-scp (>= 1.0.0) net-scp (>= 1.0.0)
net-sftp (>= 2.0.0) net-sftp (>= 2.0.0)
@ -215,7 +215,7 @@ DEPENDENCIES
acts_as_tree acts_as_tree
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
byebug byebug
capistrano (= 2.15.5) capistrano (= 2.15.9)
carrierwave carrierwave
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
formtastic (= 2.3.0) formtastic (= 2.3.0)

4
config/nginx.conf
View File

@ -1,11 +1,11 @@
upstream blog_perso_app_unicorn { 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 { server {
listen [::]:80; listen [::]:80;
server_name blog.nicolasbally.com; 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; try_files $uri/index.html $uri @unicorn;
location @unicorn { location @unicorn {