From c6c25f0595868d895df1d1afcd87c73ddf888cb4 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Tue, 7 Apr 2020 12:26:14 +0200
Subject: [PATCH] [bug] default nginx configuration does not allows secure
 cookies

---
 CHANGELOG.md                      | 1 +
 setup/nginx.conf.example          | 1 +
 setup/nginx_with_ssl.conf.example | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e303061a7..a3ca98189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Updated documentation
 - Fix a bug: installation without nginx does not remove the service from the docker-compose file
 - Fix a bug: default twitter feed is invalid
+- Fix a bug: default nginx configuration does not allows secure cookies
 
 ## v4.3.3 2020 April 1st
 
diff --git a/setup/nginx.conf.example b/setup/nginx.conf.example
index d3c7e9dbd..7bb368ebb 100644
--- a/setup/nginx.conf.example
+++ b/setup/nginx.conf.example
@@ -17,6 +17,7 @@ server {
   location @puma {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_redirect off;
     proxy_pass http://puma;
   }
diff --git a/setup/nginx_with_ssl.conf.example b/setup/nginx_with_ssl.conf.example
index 823e0282c..59d9f6be4 100644
--- a/setup/nginx_with_ssl.conf.example
+++ b/setup/nginx_with_ssl.conf.example
@@ -45,6 +45,7 @@ server {
   location @puma {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_redirect off;
     proxy_pass http://puma;
   }