eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-26 01:35:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4180 from owncloud/fix-search-reva-addr-config

Browse Source 
fix search reva addr config parsing
This commit is contained in:
Willy Kloucek
2022-07-15 07:28:56 +02:00
committed by GitHub
parent e0523796d9 52f11cfd80
commit 7c8a85f54c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/search/pkg/config/defaults/defaultconfig.go
View File

@@ -29,7 +29,7 @@ func DefaultConfig() *config.Config {
Name: "search",
},
Datapath: path.Join(defaults.BaseDataPath(), "search"),
Reva: config.Reva{
Reva: &config.Reva{
Address: "127.0.0.1:9142",
},
Events: config.Events{
@@ -68,6 +68,14 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
}
if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil {
cfg.Reva = &config.Reva{
Address: cfg.Commons.Reva.Address,
}
} else if cfg.Reva == nil {
cfg.Reva = &config.Reva{}
}
}
func Sanitize(cfg *config.Config) {