diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-11-30 17:16:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 17:16:46 -0800 |
| commit | 005a6123e98170b2bdf99eb5b8a67ca3cea94190 (patch) | |
| tree | f48a3eabf91e7be7b28190c1124d55f07246e64a | |
| parent | f4abd01adf9fb2ebdefa844b2a4f0aaf8eeb1ccc (diff) | |
| parent | 9aa990f80f8af70628c72eaf0c20d445c15b9e9d (diff) | |
| download | seaweedfs-005a6123e98170b2bdf99eb5b8a67ca3cea94190.tar.xz seaweedfs-005a6123e98170b2bdf99eb5b8a67ca3cea94190.zip | |
Merge pull request #1643 from hilimd/master
fix tls grpc ca path
| -rw-r--r-- | weed/security/tls.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/security/tls.go b/weed/security/tls.go index 5821b159d..72363768f 100644 --- a/weed/security/tls.go +++ b/weed/security/tls.go @@ -24,7 +24,7 @@ func LoadServerTLS(config *viper.Viper, component string) grpc.ServerOption { glog.V(1).Infof("load cert/key error: %v", err) return nil } - caCert, err := ioutil.ReadFile(config.GetString(component + ".ca")) + caCert, err := ioutil.ReadFile(config.GetString("grpc.ca")) if err != nil { glog.V(1).Infof("read ca cert file error: %v", err) return nil @@ -45,7 +45,7 @@ func LoadClientTLS(config *viper.Viper, component string) grpc.DialOption { return grpc.WithInsecure() } - certFileName, keyFileName, caFileName := config.GetString(component+".cert"), config.GetString(component+".key"), config.GetString(component+".ca") + certFileName, keyFileName, caFileName := config.GetString(component+".cert"), config.GetString(component+".key"), config.GetString("grpc.ca") if certFileName == "" || keyFileName == "" || caFileName == "" { return grpc.WithInsecure() } |