define ocis_url as a shared option in ocis-pkg/config

This commit is contained in:
A.Unger
2021-11-04 12:58:18 +01:00
parent 4194da4e88
commit e858fa0188
6 changed files with 17 additions and 6 deletions
+2
View File
@@ -105,6 +105,8 @@ type Cache struct {
// Config combines all available configuration parts.
type Config struct {
OcisURL string
File string `mapstructure:"file"`
Log Log `mapstructure:"log"`
Debug Debug `mapstructure:"debug"`
+1 -1
View File
@@ -123,7 +123,7 @@ func structMappings(cfg *Config) []mapping {
Destination: &cfg.InsecureBackends,
},
{
EnvVars: []string{"PROXY_OIDC_ISSUER", "OCIS_URL"}, // PROXY_OIDC_ISSUER takes precedence over OCIS_URL
EnvVars: []string{"PROXY_OIDC_ISSUER"},
Destination: &cfg.OIDC.Issuer,
},
{