zombi/nginx-proxy
Archived
11
0
Fork 0
Code Issues Pull requests Releases Activity

First try at HTTPS_METHOD

Browse source
This commit is contained in:
Steve Kamerman 2015-11-20 16:53:50 -05:00
parent 205b391677
commit 9dd6ad8503
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nginx.tmpl
View file

@ -88,6 +88,8 @@ upstream {{ $host }} {
{{ end }} {{ end }}
} }
{{ $https_method := or ($.Env.HTTPS_METHOD) "redirect" }}
{{ $default_host := or ($.Env.DEFAULT_HOST) "" }} {{ $default_host := or ($.Env.DEFAULT_HOST) "" }}
{{ $default_server := index (dict $host "" $default_host "default_server") $host }} {{ $default_server := index (dict $host "" $default_host "default_server") $host }}
@ -107,14 +109,18 @@ upstream {{ $host }} {
{{/* Use the cert specifid on the container or fallback to the best vhost match */}} {{/* Use the cert specifid on the container or fallback to the best vhost match */}}
{{ $cert := (coalesce $certName $vhostCert) }} {{ $cert := (coalesce $certName $vhostCert) }}
{{ if (and (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }} {{ $is_https := (and (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }}
{{ if $is_https }}
{{ if eq $https_method "redirect" }}
server { server {
server_name {{ $host }}; server_name {{ $host }};
listen 80 {{ $default_server }}; listen 80 {{ $default_server }};
access_log /var/log/nginx/access.log vhost; access_log /var/log/nginx/access.log vhost;
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
} }
{{ end }}
server { server {
server_name {{ $host }}; server_name {{ $host }};
@ -156,7 +162,10 @@ server {
{{ end }} {{ end }}
} }
} }
{{ else }}
{{ end }}
{{ if or (eq $is_ssl false) (eq $https_method "noredirect") }}
server { server {
server_name {{ $host }}; server_name {{ $host }};