mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-20 11:58:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4077 from wkloucek/config-descriptions-reloaded

Browse Source 
config descriptions reloaded
This commit is contained in:
Martin
2022-07-01 16:05:53 +02:00
committed by GitHub
parent 74c66cd2b3 9b4c746085
commit 6ec933c167
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/fix-remove-unused-ocs-backend-config.md
+7
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
deployments/examples/ocis_individual_services/docker-compose.yml
-1
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}
docs/helpers/environment-variable-docs-generator.go.tmpl
+5 -1
View File
@@ -77,7 +77,11 @@ func GetAnnotatedVariables(s interface{}) []ConfigField {
continue
}
v := fmt.Sprintf("%v", value.Interface())
fields = append(fields, ConfigField{Name: strings.ReplaceAll(env, ";", "<br/>"), DefaultValue: html.EscapeString(strings.Replace(v, "|", "\\|", -1)), Description: desc, Type: value.Type().Name()})
typeName := value.Type().Name()
if typeName == "" {
typeName = value.Type().String()
}
fields = append(fields, ConfigField{Name: strings.ReplaceAll(env, ";", "<br/>"), DefaultValue: html.EscapeString(strings.Replace(v, "|", "\\|", -1)), Description: desc, Type: typeName})
case reflect.Ptr:
// PolicySelectors in the Proxy are being skipped atm
// they are not configurable via env vars, if that changes
services/ocs/pkg/config/config.go
+2 -2
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:"-"`
}
services/search/pkg/config/config.go
+2 -2
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:"-"`
}