From 3464ac228653efedd4403ba5d4fa3028f49ffc03 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Sun, 16 Apr 2017 23:11:36 +0200
Subject: [PATCH] suite

---
 .../render_public/_imagecontent.html.haml     |  2 +-
 config/nginx.conf                             | 36 +++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml
index 942e194..c8fee06 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 7430792..5455c95 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -4,7 +4,7 @@ upstream ecole_eft_app_unicorn {
 
 server {
 	listen 80;
-	server_name ecole-eft-france.fr new.ecole-eft-france.fr;
+	server_name new.ecole-eft-france.fr;
 	root /home/web/ecole_eft_app/current/public;
 	try_files $uri/index.html $uri @unicorn;
 
@@ -22,6 +22,38 @@ server {
 
 server {
 	listen 80;
-    server_name  www.ecole-eft-france.fr;
+    server_name  ecole-eft-france.fr www.ecole-eft-france.fr;
     rewrite ^(.*) http://ecole-eft-france.fr$1 permanent;
 }
+
+
+
+server {
+
+    listen 443 ssl;
+
+    server_name ecole-eft-france.fr;
+    root /home/web/ecole_eft_app/current/public;
+
+    ssl on;
+    ssl_certificate /etc/nginx/ssl/ecole_eft_app/monserveur.crt;
+    ssl_certificate_key /etc/nginx/ssl/ecole_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://ecole_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