@@ -197,11 +197,7 @@ http {
197197 listen 443 ssl spdy{{ if ne $useProxyProtocol "false" }} proxy_protocol {{ end }} ;
198198 ssl_certificate /etc/ssl /deis/certs/{{ $app_domain }} .cert;
199199 ssl_certificate_key /etc/ssl /deis/keys/{{ $app_domain }} .key;
200- ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
201- {{ if exists "/deis/router/sslCiphers" }}
202- ssl_ciphers '{{ getv "/deis/router/sslCiphers" }}' ;
203- ssl_prefer_server_ciphers on;
204- {{ end }}
200+ include ssl .conf;
205201 {{ /* if there's no app SSL cert but we have a router SSL cert, enable that instead */}}
206202 {{ /* TODO ( bacongobbler) : wait for https://github.com/kelseyhightower/confd/issues/270 */}}
207203 {{ /* so we can apply this config to just subdomains of the platform domain. */}}
@@ -366,11 +362,7 @@ http {
366362 listen 443 ssl spdy{{ if ne $useProxyProtocol "false" }} proxy_protocol {{ end }} ;
367363 ssl_certificate /etc/ssl /deis/certs/{{ $app_domain }} .cert;
368364 ssl_certificate_key /etc/ssl /deis/keys/{{ $app_domain }} .key;
369- ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
370- {{ if exists "/deis/router/sslCiphers" }}
371- ssl_ciphers '{{ getv "/deis/router/sslCiphers" }}' ;
372- ssl_prefer_server_ciphers on;
373- {{ end }}
365+ include ssl .conf;
374366 {{ /* if there's no app SSL cert but we have a router SSL cert, enable that instead */}}
375367 {{ /* TODO ( bacongobbler) : wait for https://github.com/kelseyhightower/confd/issues/270 */}}
376368 {{ /* so we can apply this config to just subdomains of the platform domain. */}}
0 commit comments