Merge pull request #2383 from bacongobbler/2381-x-forwarded-proto

fix(router): only add x-forwarded-proto on https

Author: Matthew Fisher

router/templates/nginx.conf

@@ -91,6 +91,7 @@ http {
     ## end deis-store-gateway
 
     ## start service definitions for each application
+    {{ $useSSL := or .deis_router_sslCert "false" }}
     {{ $domains := .deis_domains }}{{ range $service := .deis_services }}{{ if $service.Nodes }}
     upstream {{ Base $service.Key }} {
         {{ range $upstream := $service.Nodes }}server {{ $upstream.Value }};
@@ -104,7 +105,9 @@ http {
         location / {
             proxy_buffering             off;
             proxy_set_header            Host $host;
+            {{ if ne $useSSL "false" }}
             proxy_set_header            X-Forwarded-Proto $scheme;
+            {{ end }}
             proxy_set_header            X-Forwarded-For   $proxy_add_x_forwarded_for;
             proxy_redirect              off;
             proxy_connect_timeout       10s;