diff --git a/changelog/unreleased/remove_proxy_assets.md b/changelog/unreleased/remove_proxy_assets.md new file mode 100644 index 000000000..1393b1f28 --- /dev/null +++ b/changelog/unreleased/remove_proxy_assets.md @@ -0,0 +1,6 @@ +Bugfix: Remove asset path configuration option from proxy + +We've remove the asset path configuration option (`--asset-path` or `PROXY_ASSET_PATH`) +since it didn't do anything at all. + +https://github.com/owncloud/ocis/pull/2576 diff --git a/proxy/pkg/config/config.go b/proxy/pkg/config/config.go index 9983cf9aa..9dd370118 100644 --- a/proxy/pkg/config/config.go +++ b/proxy/pkg/config/config.go @@ -45,11 +45,6 @@ type Tracing struct { Service string } -// Asset defines the available asset configuration. -type Asset struct { - Path string -} - // Policy enables us to use multiple directors. type Policy struct { Name string @@ -113,7 +108,6 @@ type Config struct { HTTP HTTP Service Service Tracing Tracing - Asset Asset Policies []Policy OIDC OIDC TokenManager TokenManager diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go index b83a5a9d7..88ceadd58 100644 --- a/proxy/pkg/flagset/flagset.go +++ b/proxy/pkg/flagset/flagset.go @@ -140,13 +140,6 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"PROXY_HTTP_ROOT"}, Destination: &cfg.HTTP.Root, }, - &cli.StringFlag{ - Name: "asset-path", - Value: flags.OverrideDefaultString(cfg.Asset.Path, ""), - Usage: "Path to custom assets", - EnvVars: []string{"PROXY_ASSET_PATH"}, - Destination: &cfg.Asset.Path, - }, &cli.StringFlag{ Name: "service-namespace", Value: flags.OverrideDefaultString(cfg.Service.Namespace, "com.owncloud.web"),