mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-04 19:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: ocs config was connected incorrectly

Browse Source
This commit is contained in:
Michael Barz
2024-04-10 16:15:58 +02:00
parent 28b95304dd
commit 8d1ba0244c
6 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/frontend/pkg/config/config.go
View File

@@ -145,6 +145,7 @@ type OCS struct {
PublicShareMustHavePassword bool `yaml:"public_sharing_share_must_have_password" env:"OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD;FRONTEND_OCS_PUBLIC_SHARE_MUST_HAVE_PASSWORD" desc:"Set this to true if you want to enforce passwords on all public shares." introductionVersion:"5.0"`
WriteablePublicShareMustHavePassword bool `yaml:"public_sharing_writeableshare_must_have_password" env:"OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD;FRONTEND_OCS_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD" desc:"Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares." introductionVersion:"5.0"`
IncludeOCMSharees bool `yaml:"include_ocm_sharees" env:"FRONTEND_OCS_INCLUDE_OCM_SHAREES" desc:"Include OCM sharees when listing sharees." introductionVersion:"5.0"`
ShowUserEmailInResults bool `yaml:"show_email_in_results" env:"FRONTEND_SHOW_USER_EMAIL_IN_RESULTS;OCIS_SHOW_USER_EMAIL_IN_RESULTS" desc:"Mask user email addresses in responses. (EXPERIMENTAL)" introductionVersion:"5.1"`
}
type CacheWarmupDrivers struct {

1
services/frontend/pkg/config/defaults/defaultconfig.go
View File

@@ -116,6 +116,7 @@ func DefaultConfig() *config.Config {
ListOCMShares: true,
PublicShareMustHavePassword: true,
IncludeOCMSharees: false,
ShowUserEmailInResults: true,
},
Middleware: config.Middleware{
Auth: config.Auth{

3
services/frontend/pkg/revaconfig/config.go
View File

@@ -339,7 +339,8 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
"productversion": version.GetString(),
},
},
"include_ocm_sharees": cfg.OCS.IncludeOCMSharees,
"include_ocm_sharees": cfg.OCS.IncludeOCMSharees,
"show_email_in_results": cfg.OCS.ShowUserEmailInResults,
},
},
},

3
services/ocs/pkg/config/config.go
View File

@@ -19,8 +19,7 @@ type Config struct {
Debug Debug `yaml:"debug"`
HTTP HTTP `yaml:"http"`
API API `yaml:"api"`
GRPCClientTLS *shared.GRPCClientTLS `yaml:"grpc_client_tls"`
GrpcClient client.Client `yaml:"-"`

3
services/ocs/pkg/config/defaults/defaultconfig.go
View File

@@ -44,9 +44,6 @@ func DefaultConfig() *config.Config {
Nodes: []string{"127.0.0.1:9233"},
TTL: time.Hour * 12,
},
API: config.API{
ShowUserEmailInResults: true,
},
}
}

4
services/ocs/pkg/config/reva.go
View File

@@ -4,7 +4,3 @@ package config
type TokenManager struct {
JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;OCS_JWT_SECRET" desc:"The secret to mint and validate jwt tokens." introductionVersion:"pre5.0"`
}
type API struct {
ShowUserEmailInResults bool `yaml:"show_email_in_results" env:"OCIS_SHOW_USER_EMAIL_IN_RESULTS" desc:"Mask user email addresses in responses. (EXPERIMENTAL)" introductionVersion:"5.1"`
}