mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-05 03:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

check if cfg.Commons is nil

Browse Source
This commit is contained in:
Willy Kloucek
2022-05-16 09:32:12 +02:00
parent 382d91b22b
commit 97220e63e6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bingo/Variables.mk
View File

@@ -3,7 +3,7 @@
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
GOPATH ?= $(shell go env GOPATH)
GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin
GO ?= $(shell command -v go)
GO ?= $(shell which go)
# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
# will be used; reinstalling only if needed.

2
extensions/idm/pkg/config/defaults/defaultconfig.go
View File

@@ -53,7 +53,7 @@ func EnsureDefaults(cfg *config.Config) {
cfg.Tracing = &config.Tracing{}
}
if cfg.AdminUserID == "" {
if cfg.AdminUserID == "" && cfg.Commons != nil {
cfg.AdminUserID = cfg.Commons.AdminUserID
}
}

2
extensions/settings/pkg/config/defaults/defaultconfig.go
View File

@@ -97,7 +97,7 @@ func EnsureDefaults(cfg *config.Config) {
cfg.Metadata.SystemUserID = cfg.Commons.SystemUserID
}
if cfg.AdminUserID == "" {
if cfg.AdminUserID == "" && cfg.Commons != nil {
cfg.AdminUserID = cfg.Commons.AdminUserID
}
}