From f71a00114e2c1ff2bbf9cf9000791e007740630e Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 20 Aug 2020 16:02:14 +0200 Subject: [PATCH 1/2] Remove empty external apps config There is nothing that would activate ocis-hello as an external app, so this can be just removed. Also it blocks the new default apps in ocis-phoenix. --- pkg/command/phoenix_ocis.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/command/phoenix_ocis.go b/pkg/command/phoenix_ocis.go index 82a61d5ba3f..5f2ebc0a1db 100644 --- a/pkg/command/phoenix_ocis.go +++ b/pkg/command/phoenix_ocis.go @@ -20,8 +20,5 @@ func configurePhoenix(cfg *config.Config) *svcconfig.Config { cfg.Phoenix.Tracing.Service = cfg.Tracing.Service } - // disable ocis-hello extension - cfg.Phoenix.Phoenix.Config.ExternalApps = []svcconfig.ExternalApp{} - return cfg.Phoenix } From 2e61377d783637cee57ca2b0828b809f04444461 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 20 Aug 2020 16:05:53 +0200 Subject: [PATCH 2/2] Add changelog --- changelog/unreleased/clear-external-apps.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/clear-external-apps.md diff --git a/changelog/unreleased/clear-external-apps.md b/changelog/unreleased/clear-external-apps.md new file mode 100644 index 00000000000..bd7d1a7a77d --- /dev/null +++ b/changelog/unreleased/clear-external-apps.md @@ -0,0 +1,5 @@ +Bugfix: Don't enforce empty external apps slice + +The command for ocis-phoenix enforced an empty external apps configuration. This was removed, as it was blocking a new set of default external apps in ocis-phoenix. + +https://github.com/owncloud/ocis/pull/473