DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1769 from aledbf/port-redirect

Browse source 
Use custom https port in redirects
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-11-30 11:13:59 -03:00 committed by GitHub
commit 120bb1deb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -387,7 +387,13 @@ http {
{{ end }} {{ end }}
{{ end }} {{ end }}
server_name {{ $hostname }}; 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; return 301 $scheme://{{ $to }}$request_uri;
{{ end }}
} }
{{ end }} {{ end }}
@ -679,7 +685,12 @@ stream {
{{ if (or $location.Rewrite.ForceSSLRedirect (and (not (empty $server.SSLCertificate)) $location.Rewrite.SSLRedirect)) }} {{ if (or $location.Rewrite.ForceSSLRedirect (and (not (empty $server.SSLCertificate)) $location.Rewrite.SSLRedirect)) }}
# enforce ssl on server side # enforce ssl on server side
if ($pass_access_scheme = http) { 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; return 301 https://$best_http_host$request_uri;
{{ end }}
} }
{{ end }} {{ end }}