mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-06-20 22:09:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from butonic/update-config

Browse Source 
integrate with current ocis config
This commit is contained in:
Alex Unger
2020-03-17 19:24:38 +01:00
committed by GitHub
parent 0ff9f550e3 6738304669
commit 7345e10e05
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/new-ocis-config.md Normal file
View File

@@ -0,0 +1,7 @@
Change: default to running behind ocis-proxy
We changed the default configuration to integrate better with ocis.
Clients are supposed to use the ocis-proxy endpoint `https://localhost:9200`
https://github.com/owncloud/ocis-phoenix/pull/55

6
pkg/flagset/flagset.go
View File

@@ -152,7 +152,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "web-config-server",
Value: "http://localhost:9140",
Value: "https://localhost:9200",
Usage: "Server URL",
EnvVars: []string{"PHOENIX_WEB_CONFIG_SERVER"},
Destination: &cfg.Phoenix.Config.Server,
@@ -179,14 +179,14 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "oidc-metadata-url",
Value: "https://localhost:9130/.well-known/openid-configuration",
Value: "https://localhost:9200/.well-known/openid-configuration",
Usage: "OpenID Connect metadata URL",
EnvVars: []string{"PHOENIX_OIDC_METADATA_URL"},
Destination: &cfg.Phoenix.Config.OpenIDConnect.MetadataURL,
},
&cli.StringFlag{
Name: "oidc-authority",
Value: "https://localhost:9130",
Value: "https://localhost:9200",
Usage: "OpenID Connect authority", // TODO rename to Issuer
EnvVars: []string{"PHOENIX_OIDC_AUTHORITY"},
Destination: &cfg.Phoenix.Config.OpenIDConnect.Authority,