Merge pull request #91 from pirelenito/master

fixes SSL support while mixing HTTPS and non-HTTPS hosts
This commit is contained in:
Jason Wilder 2015-02-22 15:00:48 -07:00
commit c3534b7195

View file

@ -129,16 +129,16 @@ server {
} }
} }
{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
server { server {
server_name {{ $host }}; server_name {{ $host }};
listen 443 ssl; listen 443 ssl;
return 503; return 503;
{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
ssl_certificate /etc/nginx/certs/default.crt; ssl_certificate /etc/nginx/certs/default.crt;
ssl_certificate_key /etc/nginx/certs/default.key; ssl_certificate_key /etc/nginx/certs/default.key;
{{ end }}
} }
{{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}