Explorar o código

Support VIRTUAL_PROTO=https for HTTPS backends

Mike Dillon %!s(int64=10) %!d(string=hai) anos
pai
achega
6c3b3c87be
Modificáronse 1 ficheiros con 5 adicións e 2 borrados
  1. 5 2
      nginx.tmpl

+ 5 - 2
nginx.tmpl

@@ -68,6 +68,9 @@ upstream {{ $host }} {
 {{ end }}
 {{ end }}
 }
 }
 
 
+{{/* Get the VIRTUAL_PROTO defined by containers w/ the same vhost, falling back to "http" */}}
+{{ $proto := or (first (groupByKeys $containers "Env.VIRTUAL_PROTO")) "http" }}
+
 {{/* Get the first cert name defined by containers w/ the same vhost */}}
 {{/* Get the first cert name defined by containers w/ the same vhost */}}
 {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
 {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
 
 
@@ -105,7 +108,7 @@ server {
 	add_header Strict-Transport-Security "max-age=31536000; includeSubdomains";
 	add_header Strict-Transport-Security "max-age=31536000; includeSubdomains";
 
 
 	location / {
 	location / {
-		proxy_pass http://{{ $host }};
+		proxy_pass {{ $proto }}://{{ $host }};
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
 		auth_basic	"Restricted {{ $host }}";
 		auth_basic	"Restricted {{ $host }}";
 		auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};
 		auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};
@@ -118,7 +121,7 @@ server {
 	server_name {{ $host }};
 	server_name {{ $host }};
 
 
 	location / {
 	location / {
-		proxy_pass http://{{ $host }};
+		proxy_pass {{ $proto }}://{{ $host }};
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
 		{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
 		auth_basic	"Restricted {{ $host }}";
 		auth_basic	"Restricted {{ $host }}";
 		auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};
 		auth_basic_user_file	{{ (printf "/etc/nginx/htpasswd/%s" $host) }};