From fa7bce78536228bd9b159ad80648b0de931317f3 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 11 Feb 2019 21:05:36 +0800 Subject: [PATCH] make both golang and python option for ssl ca file as ssl_ca_certs --- pkg/cloudcommon/app.go | 4 ++-- pkg/cloudcommon/options.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cloudcommon/app.go b/pkg/cloudcommon/app.go index 6234305c93..5ed94b973a 100644 --- a/pkg/cloudcommon/app.go +++ b/pkg/cloudcommon/app.go @@ -33,9 +33,9 @@ func ServeForever(app *appsrv.Application, options *CommonOptions) { log.Infof("Start listen on %s://%s", proto, addr) if options.EnableSsl { certfile := options.SslCertfile - if len(options.SslCafile) > 0 { + if len(options.SslCaCerts) > 0 { var err error - certfile, err = seclib2.MergeCaCertFiles(options.SslCafile, options.SslCertfile) + certfile, err = seclib2.MergeCaCertFiles(options.SslCaCerts, options.SslCertfile) if err != nil { log.Fatalf("fail to merge ca+cert content: %s", err) } diff --git a/pkg/cloudcommon/options.go b/pkg/cloudcommon/options.go index e050237639..fc94689fd0 100644 --- a/pkg/cloudcommon/options.go +++ b/pkg/cloudcommon/options.go @@ -39,7 +39,7 @@ type CommonOptions struct { NotifyAdminUser string `default:"sysadmin" help:"System administrator user ID or name to notify"` EnableSsl bool `help:"Enable https"` - SslCafile string `help:"ssl certificate ca root file, separating ca and cert file is not encouraged" alias:"ca-file"` + SslCaCerts string `help:"ssl certificate ca root file, separating ca and cert file is not encouraged" alias:"ca-file"` SslCertfile string `help:"ssl certification file, normally combines all the certificates in the chain" alias:"cert-file"` SslKeyfile string `help:"ssl certification private key file" alias:"key-file"`