Merge pull request #3255 from croemmich/proxy-headers

feat(router): set additional X-Forwarded headers

Author: carmstrong

router/image/templates/nginx.conf

@@ -156,10 +156,16 @@ http {
             {{ if eq $useFirewall "true" }}include                     /opt/nginx/firewall/active-mode.rules;{{ end }}
             proxy_buffering             off;
             proxy_set_header            Host $host;
-            {{ if ne $useSSL "false" }}
-            proxy_set_header            X-Forwarded-Proto $scheme;
-            {{ end }}
+            set $access_ssl 'off';
+            set $access_port '80';
+            if ($access_scheme ~ https) {
+                set $access_ssl 'on';
+                set $access_port '443';
+            }
+            proxy_set_header            X-Forwarded-Port  $access_port;
+            proxy_set_header            X-Forwarded-Proto $access_scheme;
             proxy_set_header            X-Forwarded-For   $proxy_add_x_forwarded_for;
+            proxy_set_header            X-Forwarded-Ssl   $access_ssl;
             proxy_redirect              off;
             proxy_connect_timeout       30s;
             proxy_send_timeout          1200s;