From 6738304669aba5b4b1efbd5cf80fd2505551b1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 17 Mar 2020 18:06:21 +0100 Subject: [PATCH] integrate with current ocis config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/new-ocis-config.md | 7 +++++++ pkg/flagset/flagset.go | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 changelog/unreleased/new-ocis-config.md diff --git a/changelog/unreleased/new-ocis-config.md b/changelog/unreleased/new-ocis-config.md new file mode 100644 index 0000000000..c997b4aae6 --- /dev/null +++ b/changelog/unreleased/new-ocis-config.md @@ -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 diff --git a/pkg/flagset/flagset.go b/pkg/flagset/flagset.go index cd910c607a..7a8c21bc60 100644 --- a/pkg/flagset/flagset.go +++ b/pkg/flagset/flagset.go @@ -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,