DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CA chain in the same file as Certificate files

Browse source
This commit is contained in:
Ricardo Pchevuzinske Katz 2017-02-07 09:13:14 -02:00
parent 39643bc4f6
commit e1a52d1ec1
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/pkg/net/ssl/ssl.go
View file

@ -99,21 +99,21 @@ func AddOrUpdateCertAndKey(name string, cert, key, ca []byte) (*ingress.SSLCert,
return nil, errors.New(oe) return nil, errors.New(oe)
} }
caName := fmt.Sprintf("ca-%v.pem", name) caFile, err := os.OpenFile(pemFileName, os.O_RDWR|os.O_APPEND, 0600)
caFileName := fmt.Sprintf("%v/%v", ingress.DefaultSSLDirectory, caName)
f, err := os.Create(caFileName)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not create ca pem file %v: %v", caFileName, err) return nil, fmt.Errorf("Could not open file %v for writing additional CA chains: %v", pemFileName, err)
} }
defer f.Close()
_, err = f.Write(ca) defer caFile.Close()
_, err = caFile.Write([]byte("\n"))
if err != nil { if err != nil {
return nil, fmt.Errorf("could not create ca pem file %v: %v", caFileName, err) return nil, fmt.Errorf("could not append CA to cert file %v: %v", pemFileName, err)
} }
f.Write([]byte("\n")) caFile.Write(ca)
caFile.Write([]byte("\n"))
return &ingress.SSLCert{ return &ingress.SSLCert{
CAFileName: caFileName, CAFileName: pemFileName,
PemFileName: pemFileName, PemFileName: pemFileName,
PemSHA: pemSHA1(pemFileName), PemSHA: pemSHA1(pemFileName),
CN: cn, CN: cn,