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

fix settings service bunldes config merge problems

Browse Source
This commit is contained in:
Willy Kloucek
2023-02-20 08:10:22 +01:00
parent 30faae2ae4
commit a2422e8b9d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/settings/pkg/config/defaults/defaultconfig.go
View File

@@ -52,7 +52,7 @@ func DefaultConfig() *config.Config {
StorageAddress: "127.0.0.1:9215",
SystemUserIDP: "internal",
},
Bundles: rdefaults.GenerateBundlesDefaultRoles(),
Bundles: nil,
}
}
@@ -122,6 +122,10 @@ func EnsureDefaults(cfg *config.Config) {
}
func Sanitize(cfg *config.Config) {
if cfg.Bundles == nil {
cfg.Bundles = rdefaults.GenerateBundlesDefaultRoles()
}
// sanitize config
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")