From 40b7aaa7ec628320c870aab32810f0386f1f2aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 9 Sep 2022 11:54:18 +0000 Subject: [PATCH] make jsoncs3 default public share backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/sharing/pkg/config/defaults/defaultconfig.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/services/sharing/pkg/config/defaults/defaultconfig.go b/services/sharing/pkg/config/defaults/defaultconfig.go index 668e532127..8e502114a9 100644 --- a/services/sharing/pkg/config/defaults/defaultconfig.go +++ b/services/sharing/pkg/config/defaults/defaultconfig.go @@ -53,7 +53,7 @@ func DefaultConfig() *config.Config { DBName: "owncloud", }, }, - PublicSharingDriver: "cs3", + PublicSharingDriver: "jsoncs3", PublicSharingDrivers: config.PublicSharingDrivers{ JSON: config.PublicSharingJSONDriver{ File: filepath.Join(defaults.BaseDataPath(), "storage", "publicshares.json"), @@ -138,6 +138,14 @@ func EnsureDefaults(cfg *config.Config) { if cfg.PublicSharingDrivers.CS3.SystemUserID == "" && cfg.Commons != nil && cfg.Commons.SystemUserID != "" { cfg.PublicSharingDrivers.CS3.SystemUserID = cfg.Commons.SystemUserID } + + if cfg.PublicSharingDrivers.JSONCS3.SystemUserAPIKey == "" && cfg.Commons != nil && cfg.Commons.SystemUserAPIKey != "" { + cfg.PublicSharingDrivers.JSONCS3.SystemUserAPIKey = cfg.Commons.SystemUserAPIKey + } + + if cfg.PublicSharingDrivers.JSONCS3.SystemUserID == "" && cfg.Commons != nil && cfg.Commons.SystemUserID != "" { + cfg.PublicSharingDrivers.JSONCS3.SystemUserID = cfg.Commons.SystemUserID + } } func Sanitize(cfg *config.Config) {