From f2badd31753addc7b57b7b829326c93ea6c052ff Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 16 Aug 2018 15:18:14 +0200 Subject: [PATCH] suite --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- config/nginx.conf | 13 +++++++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 69a2e99..7294750 100755 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ group :development, :test do #gem 'capistrano-rails' #gem "rvm-capistrano" - gem "capistrano", '2.15.5', group: :development + gem "capistrano", '2.15.9', group: :development gem "rvm-capistrano",'1.4.1', group: :development, require: false gem 'net-ssh', '~>2.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9d1ec74..9e5e5c7 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) slop (~> 3.6) - capistrano (2.15.5) + capistrano (2.15.9) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -91,7 +91,7 @@ GEM haml (>= 3.1, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - highline (1.7.2) + highline (2.0.0) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) @@ -133,7 +133,7 @@ GEM net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (2.7.0) - net-ssh-gateway (1.2.0) + net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) @@ -255,7 +255,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 2998927..178b14b 100755 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -3,8 +3,8 @@ upstream negos_app_unicorn { } server { - listen 80; - server_name negos.pro negos-pro.fr commander.vouisstar.fr negos.quartz.xyz; + listen [::]:80; + server_name negos.pro negos-pro.fr commander.vouisstar.fr negos.quartz.xyz *.negos.pro; root /srv/www/web/negos_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -18,10 +18,15 @@ server { error_page 500 502 503 504 /500.html; client_max_body_size 4G; keepalive_timeout 10; + include snippets/letsencrypt.conf; } server { - listen 80; + listen [::]:80; server_name www.negos-pro.fr www.negos.pro; - rewrite ^(.*) http://negos.pro$1 permanent; + + + return 301 http://negos.pro$request_uri; + + include snippets/letsencrypt.conf; }