From e8a5e0b0df94b7a8ec0829296e8acd2a089b994c Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Tue, 18 Apr 2017 00:11:09 +0200 Subject: [PATCH] ssl --- .../render_public/_imagecontent.html.haml | 2 +- config/nginx.conf | 39 +++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml index 57f456a..7d01f16 100644 --- a/app/views/portlets/render_public/_imagecontent.html.haml +++ b/app/views/portlets/render_public/_imagecontent.html.haml @@ -21,7 +21,7 @@ -else -url ="" --url = "http://"+request.host_with_port+url +-url = "https://"+request.host_with_port+url -style = "" -style = "text-align:center;" if input.alignement == "center" diff --git a/config/nginx.conf b/config/nginx.conf index c5d2684..7883cf0 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream blog_eft_app_unicorn { server { listen 80; - server_name blogeft.bally.me blog.technique-eft.com; + server_name blogeft.bally.me ; root /home/web/blog_eft_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -23,6 +23,39 @@ server { server { listen 80; - server_name www.blog.technique-eft.com; - rewrite ^(.*) http://blog.technique-eft.com$1 permanent; + server_name blog.technique-eft.com www.blog.technique-eft.com; + rewrite ^(.*) https://blog.technique-eft.com$1 permanent; } + + + + +server { + + listen 443 ssl; + + server_name blog.technique-eft.com; + 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; + + + try_files $uri/index.html $uri @unicorn; + + #access_log /var/log/nginx/YOUR_APP_NAME_access.log combined; + #error_log /var/log/nginx/YOUR_APP_NAME_error.log; + + location @unicorn { + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_pass http://blog_eft_app_unicorn; + proxy_set_header X-Forwarded-Proto https; + } + + error_page 500 502 503 504 /500.html; + client_max_body_size 4G; + keepalive_timeout 10; +} \ No newline at end of file