Introduce TLS Settings for all reva grpc services and clients
This commit is contained in:
committed by
Ralf Haferkamp
parent
e373e48383
commit
3d57f5cc21
@@ -128,7 +128,7 @@ func Server(cfg *config.Config) *cli.Command {
|
||||
|
||||
func loadMiddlewares(ctx context.Context, logger log.Logger, cfg *config.Config) alice.Chain {
|
||||
rolesClient := settingssvc.NewRoleService("com.owncloud.api.settings", grpc.DefaultClient())
|
||||
revaClient, err := pool.GetGatewayServiceClient(cfg.Reva.Address)
|
||||
revaClient, err := pool.GetGatewayServiceClient(cfg.Reva.Address, cfg.Reva.GetRevaOptions()...)
|
||||
var userProvider backend.UserBackend
|
||||
switch cfg.AccountBackend {
|
||||
case "cs3":
|
||||
|
||||
@@ -49,9 +49,7 @@ func DefaultConfig() *config.Config {
|
||||
},
|
||||
},
|
||||
PolicySelector: nil,
|
||||
Reva: &shared.Reva{
|
||||
Address: "127.0.0.1:9142",
|
||||
},
|
||||
Reva: shared.DefaultRevaConfig(),
|
||||
PreSignedURL: config.PreSignedURL{
|
||||
AllowedHTTPMethods: []string{"GET"},
|
||||
Enabled: true,
|
||||
@@ -244,7 +242,9 @@ func EnsureDefaults(cfg *config.Config) {
|
||||
|
||||
if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil {
|
||||
cfg.Reva = &shared.Reva{
|
||||
Address: cfg.Commons.Reva.Address,
|
||||
Address: cfg.Commons.Reva.Address,
|
||||
TLSMode: cfg.Commons.Reva.TLSMode,
|
||||
TLSCACert: cfg.Commons.Reva.TLSCACert,
|
||||
}
|
||||
} else if cfg.Reva == nil {
|
||||
cfg.Reva = &shared.Reva{}
|
||||
|
||||
Reference in New Issue
Block a user