mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-26 07:28:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add sharees additional info paramater config to ocs

Browse Source
This commit is contained in:
Ishank Arora
2021-10-19 11:32:41 +02:00
parent 75a4015954
commit 89ae20758d
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/unreleased/ocs-additional-info.md Normal file
View File

@@ -0,0 +1,3 @@
Enhancement: Add sharees additional info paramater config to ocs
https://github.com/owncloud/ocis/pull/2637

11
storage/pkg/command/frontend.go
View File

@@ -194,11 +194,12 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
"public_url": cfg.Reva.Frontend.PublicURL,
},
"ocs": map[string]interface{}{
"share_prefix": cfg.Reva.Frontend.OCSSharePrefix,
"home_namespace": cfg.Reva.Frontend.OCSHomeNamespace,
"resource_info_cache_ttl": cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
"prefix": cfg.Reva.Frontend.OCSPrefix,
"cache_warmup_driver": cfg.Reva.Frontend.OCSCacheWarmupDriver,
"share_prefix": cfg.Reva.Frontend.OCSSharePrefix,
"home_namespace": cfg.Reva.Frontend.OCSHomeNamespace,
"resource_info_cache_ttl": cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
"prefix": cfg.Reva.Frontend.OCSPrefix,
"additional_info_attribute": cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
"cache_warmup_driver": cfg.Reva.Frontend.OCSCacheWarmupDriver,
"cache_warmup_drivers": map[string]interface{}{
"cbox": map[string]interface{}{
"db_username": cfg.Reva.Sharing.UserSQLUsername,

25
storage/pkg/config/config.go
View File

@@ -144,18 +144,19 @@ type Groups struct {
type FrontendPort struct {
Port
AppProviderPrefix string
ArchiverPrefix string
DatagatewayPrefix string
Favorites bool
OCDavPrefix string
OCSPrefix string
OCSSharePrefix string
OCSHomeNamespace string
PublicURL string
OCSCacheWarmupDriver string
OCSResourceInfoCacheTTL int
Middleware Middleware
AppProviderPrefix string
ArchiverPrefix string
DatagatewayPrefix string
Favorites bool
OCDavPrefix string
OCSPrefix string
OCSSharePrefix string
OCSHomeNamespace string
PublicURL string
OCSCacheWarmupDriver string
OCSAdditionalInfoAttribute string
OCSResourceInfoCacheTTL int
Middleware Middleware
}
// Middleware configures reva middlewares.

7
storage/pkg/flagset/frontend.go
View File

@@ -179,6 +179,13 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
EnvVars: []string{"STORAGE_FRONTEND_OCS_CACHE_WARMUP_DRIVER"},
Destination: &cfg.Reva.Frontend.OCSCacheWarmupDriver,
},
&cli.StringFlag{
Name: "ocs-additional-info-attribute",
Value: flags.OverrideDefaultString(cfg.Reva.Frontend.OCSAdditionalInfoAttribute, "{{.Mail}}"),
Usage: "the additional info to be returned when searching for users",
EnvVars: []string{"STORAGE_FRONTEND_OCS_ADDITIONAL_INFO_ATTRIBUTE"},
Destination: &cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
},
// Gateway
&cli.StringFlag{