From 6c3b3c87befefdb181e3ca212bcaacb69ecb9e21 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Sat, 14 Feb 2015 16:02:39 -0800 Subject: [PATCH] Support VIRTUAL_PROTO=https for HTTPS backends --- nginx.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index d373ce3..b694a31 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -68,6 +68,9 @@ upstream {{ $host }} { {{ 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 */}} {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }} @@ -105,7 +108,7 @@ server { add_header Strict-Transport-Security "max-age=31536000; includeSubdomains"; location / { - proxy_pass http://{{ $host }}; + proxy_pass {{ $proto }}://{{ $host }}; {{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }} auth_basic "Restricted {{ $host }}"; auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }}; @@ -118,7 +121,7 @@ server { server_name {{ $host }}; location / { - proxy_pass http://{{ $host }}; + proxy_pass {{ $proto }}://{{ $host }}; {{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }} auth_basic "Restricted {{ $host }}"; auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};