From be185b9743f995ce73ab8bdf3aaf9f5b70e07ac3 Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Wed, 29 Nov 2017 17:16:45 -0300
Subject: [PATCH] Use custom https port in redirects

---
 rootfs/etc/nginx/template/nginx.tmpl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index ff6eedcd0a..16d1440fda 100644
--- a/rootfs/etc/nginx/template/nginx.tmpl
+++ b/rootfs/etc/nginx/template/nginx.tmpl
@@ -387,7 +387,13 @@ http {
         {{ end }}
         {{ end }}
         server_name {{ $hostname }};
+
+        {{ if ne $all.ListenPorts.HTTPS 443 }}
+        {{ $redirect_port := (printf ":%v" $all.ListenPorts.HTTPS) }}
+        return 301 $scheme://{{ $to }}{{ $redirect_port }}$request_uri;
+        {{ else }}
         return 301 $scheme://{{ $to }}$request_uri;
+        {{ end }}
     }
     {{ end }}
 
@@ -679,7 +685,12 @@ stream {
             {{ if (or $location.Rewrite.ForceSSLRedirect (and (not (empty $server.SSLCertificate)) $location.Rewrite.SSLRedirect)) }}
             # enforce ssl on server side
             if ($pass_access_scheme = http) {
+                {{ if ne $all.ListenPorts.HTTPS 443 }}
+                {{ $redirect_port := (printf ":%v" $all.ListenPorts.HTTPS) }}
+                return 301 https://$best_http_host{{ $redirect_port }}$request_uri;
+                {{ else }}
                 return 301 https://$best_http_host$request_uri;
+                {{ end }}
             }
             {{ end }}