From 4624b5bc771b72ca5a1d5f6bd87f0df54d2f50f5 Mon Sep 17 00:00:00 2001 From: Gabor Lekeny Date: Fri, 16 Aug 2019 06:31:15 +0200 Subject: [PATCH] Change PemSHA to CASHA --- internal/ingress/annotations/proxyssl/main_test.go | 6 +++--- rootfs/etc/nginx/template/nginx.tmpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/ingress/annotations/proxyssl/main_test.go b/internal/ingress/annotations/proxyssl/main_test.go index 922fe0f89..37279a550 100644 --- a/internal/ingress/annotations/proxyssl/main_test.go +++ b/internal/ingress/annotations/proxyssl/main_test.go @@ -77,7 +77,7 @@ func (m mockSecret) GetAuthCertificate(name string) (*resolver.AuthSSLCert, erro return &resolver.AuthSSLCert{ Secret: "default/demo-secret", CAFileName: "/ssl/ca.crt", - PemSHA: "abc", + CASHA: "abc", }, nil } @@ -206,12 +206,12 @@ func TestEquals(t *testing.T) { sslCert1 := resolver.AuthSSLCert{ Secret: "default/demo-secret", CAFileName: "/ssl/ca.crt", - PemSHA: "abc", + CASHA: "abc", } sslCert2 := resolver.AuthSSLCert{ Secret: "default/other-demo-secret", CAFileName: "/ssl/ca.crt", - PemSHA: "abc", + CASHA: "abc", } cfg1.AuthSSLCert = sslCert1 cfg2.AuthSSLCert = sslCert2 diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 127d69aed..009608a5a 100755 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -806,7 +806,7 @@ stream { {{ end }} {{ if not (empty $server.ProxySSL.CAFileName) }} - # PEM sha: {{ $server.ProxySSL.PemSHA }} + # PEM sha: {{ $server.ProxySSL.CASHA }} proxy_ssl_certificate {{ $server.ProxySSL.CAFileName }}; proxy_ssl_certificate_key {{ $server.ProxySSL.CAFileName }}; proxy_ssl_trusted_certificate {{ $server.ProxySSL.CAFileName }};