mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-31 01:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3697 from owncloud/change-default-sharing-driver-to-cs3

Browse Source 
[full-ci] change default sharing driver to cs3
This commit is contained in:
Jörn Friedrich Dreyer
2022-06-20 07:55:12 +00:00
committed by GitHub
parent 2e913fafd6 379a7fde45
commit 09b89f7a3c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/sharing/pkg/config/defaults/defaultconfig.go
View File

@@ -33,13 +33,13 @@ func DefaultConfig() *config.Config {
Reva: &config.Reva{
Address: "127.0.0.1:9142",
},
UserSharingDriver: "json", // TODO use "cs3", see https://github.com/owncloud/ocis/pull/3697
UserSharingDriver: "cs3",
UserSharingDrivers: config.UserSharingDrivers{
JSON: config.UserSharingJSONDriver{
File: filepath.Join(defaults.BaseDataPath(), "storage", "shares.json"),
},
CS3: config.UserSharingCS3Driver{
ProviderAddr: "127.0.0.1:9215", // metadata storage
ProviderAddr: "127.0.0.1:9215", // system storage
SystemUserIDP: "internal",
},
OwnCloudSQL: config.UserSharingOwnCloudSQLDriver{
@@ -49,15 +49,16 @@ func DefaultConfig() *config.Config {
DBName: "owncloud",
},
},
PublicSharingDriver: "json", // TODO use "cs3", see https://github.com/owncloud/ocis/pull/3697
PublicSharingDriver: "cs3",
PublicSharingDrivers: config.PublicSharingDrivers{
JSON: config.PublicSharingJSONDriver{
File: filepath.Join(defaults.BaseDataPath(), "storage", "publicshares.json"),
},
CS3: config.PublicSharingCS3Driver{
ProviderAddr: "127.0.0.1:9215", // metadata storage
ProviderAddr: "127.0.0.1:9215", // system storage
SystemUserIDP: "internal",
},
// TODO implement and add owncloudsql publicshare driver
},
Events: config.Events{
Addr: "127.0.0.1:9233",

2
extensions/sharing/pkg/revaconfig/config.go
View File

@@ -50,6 +50,7 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
"db_name": cfg.UserSharingDrivers.OwnCloudSQL.DBName,
},
"cs3": map[string]interface{}{
"gateway_addr": cfg.UserSharingDrivers.CS3.ProviderAddr,
"provider_addr": cfg.UserSharingDrivers.CS3.ProviderAddr,
"service_user_id": cfg.UserSharingDrivers.CS3.SystemUserID,
"service_user_idp": cfg.UserSharingDrivers.CS3.SystemUserIDP,
@@ -75,6 +76,7 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
"janitor_run_interval": cfg.PublicSharingDrivers.SQL.JanitorRunInterval,
},
"cs3": map[string]interface{}{
"gateway_addr": cfg.PublicSharingDrivers.CS3.ProviderAddr,
"provider_addr": cfg.PublicSharingDrivers.CS3.ProviderAddr,
"service_user_id": cfg.PublicSharingDrivers.CS3.SystemUserID,
"service_user_idp": cfg.PublicSharingDrivers.CS3.SystemUserIDP,