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

fix malformed desc tags, add missing descriptions and remove static configuration

Browse Source
This commit is contained in:
Willy Kloucek
2022-07-01 11:03:48 +02:00
parent 755f77b08a
commit 9b4c746085
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/fix-remove-unused-ocs-backend-config.md Normal file
View File

@@ -0,0 +1,7 @@
Bugfix: Remove static ocs user backend config
We've remove the `OCS_ACCOUNT_BACKEND_TYPE` configuration option.
It was intended to allow configuration of different user backends for the ocs service.
Right now the ocs service only has a "cs3" backend. Therefor it's a static entry and not configurable.
https://github.com/owncloud/ocis/pull/4077

1
deployments/examples/ocis_individual_services/docker-compose.yml
View File

@@ -336,7 +336,6 @@ services:
OCS_HTTP_ADDR: 0.0.0.0:9110
OCS_ACCOUNT_BACKEND_TYPE: cs3
OCS_IDM_ADDRESS: https://${OCIS_DOMAIN}
OCS_JWT_SECRET: ${OCIS_JWT_SECRET}

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

@@ -23,8 +23,8 @@ type Config struct {
IdentityManagement IdentityManagement `yaml:"identity_management"`
AccountBackend string `yaml:"account_backend" env:"OCS_ACCOUNT_BACKEND_TYPE"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY" desc: "Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
AccountBackend string `yaml:"-"` // we only support cs3 backend, no need to have this configurable
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY" desc:"Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
Context context.Context `yaml:"-"`
}

4
services/search/pkg/config/config.go
View File

@@ -18,11 +18,11 @@ type Config struct {
GRPC GRPC `yaml:"grpc"`
Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH"`
Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH" desc:"Path for the search persistence directory."`
Reva Reva `yaml:"reva"`
Events Events `yaml:"events"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY" desc: "Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY" desc:"Machine auth API key used for accessing the 'auth-machine' service to impersonate users."`
Context context.Context `yaml:"-"`
}