From da1495fb49c66b4dea5aa136d3f787188cc60783 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sun, 15 Jul 2018 14:44:04 +0200 Subject: [PATCH] ssl --- app/views/layouts/public.html.haml | 2 +- config/nginx.conf | 39 ++++++++++++++++-------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 1690122..a05c535 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -32,7 +32,7 @@ =link_to "Une question ?", "/me-contacter.html"     #banner - =link_to image_tag("logo.png", :id => "logo"), "/" + =link_to image_tag("logo.png", :id => "logo", :alt => "Blog EFT"), "/" diff --git a/config/nginx.conf b/config/nginx.conf index 7883cf0..d922ca7 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,28 +1,28 @@ upstream blog_eft_app_unicorn { - server unix:/home/web/blog_eft_app/shared/unicorn.sock fail_timeout=0; + server unix:/home/web/blog_eft_app/shared/unicorn.sock fail_timeout=0; } server { - listen 80; - server_name blogeft.bally.me ; - root /home/web/blog_eft_app/current/public; - try_files $uri/index.html $uri @unicorn; + listen 80; + server_name blogeft.bally.me ; + root /home/web/blog_eft_app/current/public; + try_files $uri/index.html $uri @unicorn; - location @unicorn { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://blog_eft_app_unicorn; + location @unicorn { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_pass http://blog_eft_app_unicorn; proxy_read_timeout 6000; - } + } - error_page 500 502 503 504 /500.html; - client_max_body_size 4G; - keepalive_timeout 10; + error_page 500 502 503 504 /500.html; + client_max_body_size 4G; + keepalive_timeout 10; } server { - listen 80; + listen 80; server_name blog.technique-eft.com www.blog.technique-eft.com; rewrite ^(.*) https://blog.technique-eft.com$1 permanent; } @@ -38,8 +38,8 @@ server { root /home/web/blog_eft_app/current/public; ssl on; - ssl_certificate /etc/nginx/ssl/blog_eft_app/monserveur.crt; - ssl_certificate_key /etc/nginx/ssl/blog_eft_app/monserveur.key; + ssl_certificate /etc/letsencrypt/live/blog.technique-eft.com/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/blog.technique-eft.com/privkey.pem; # managed by Certbot try_files $uri/index.html $uri @unicorn; @@ -58,4 +58,7 @@ server { error_page 500 502 503 504 /500.html; client_max_body_size 4G; keepalive_timeout 10; -} \ No newline at end of file + + include snippets/letsencrypt.conf; +} +