BUGFIX: attempt to forward on the protocol set by haproxy

discourse · Jan 9, 2014 · e8afe87 · e8afe87
1 parent cac3257
commit e8afe87
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
@@ -37,7 +37,7 @@ server {
 
   location / {
     root $public;
-  
+
     location ~* \.(eot|ttf|woff)$ {
 	    add_header Access-Control-Allow-Origin *;
 	    expires 1y;
@@ -87,7 +87,14 @@ server {
   location @discourse {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
+
+    # attempt to preserve the proto
+    map $http_x_forwarded_proto $thescheme {
+      default $scheme;
+      https https;
+    }
+
+    proxy_set_header X-Forwarded-Proto $thescheme;
     proxy_set_header Host $http_host;
 
     proxy_pass http://discourse;