From 933b1eb76cfe7957e31df7c00129decc556520c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 30 May 2024 11:09:02 +0200 Subject: [PATCH] default to collabora online MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/collaboration/pkg/config/defaults/defaultconfig.go | 4 ++-- services/frontend/pkg/config/config.go | 2 +- services/frontend/pkg/config/defaults/defaultconfig.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/collaboration/pkg/config/defaults/defaultconfig.go b/services/collaboration/pkg/config/defaults/defaultconfig.go index ef4edc91ee..5ec1d68973 100644 --- a/services/collaboration/pkg/config/defaults/defaultconfig.go +++ b/services/collaboration/pkg/config/defaults/defaultconfig.go @@ -21,8 +21,8 @@ func DefaultConfig() *config.Config { Name: "collaboration", }, App: config.App{ - Name: "WOPI app", - Description: "Open office documents with a WOPI app", + Name: "Collabora Online", + Description: "Open office documents with Collabora Online", Icon: "image-edit", LockName: "com.github.owncloud.collaboration", }, diff --git a/services/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go index 2d8b8a6da9..a3e1670e7a 100644 --- a/services/frontend/pkg/config/config.go +++ b/services/frontend/pkg/config/config.go @@ -109,7 +109,7 @@ type Auth struct { type AppHandler struct { Prefix string `yaml:"-"` Insecure bool `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE" desc:"Allow insecure connections to the frontend." introductionVersion:"pre5.0"` - SecureViewApp string `yaml:"secure_view_app" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP" desc:"Name of the app to use for secure view. Should match the name configured for the CS3 app provider." introductionVersion:"pre5.1"` + SecureViewApp string `yaml:"secure_view_app" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP" desc:"Name of the app to use for secure view. Should match COLLABORATION_APP_NAME, the name configured for the CS3 app provider." introductionVersion:"5.1"` } type Archiver struct { diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go index 4f214f457b..a66fb2ecb0 100644 --- a/services/frontend/pkg/config/defaults/defaultconfig.go +++ b/services/frontend/pkg/config/defaults/defaultconfig.go @@ -93,7 +93,8 @@ func DefaultConfig() *config.Config { PreferredUploadType: "sha1", }, AppHandler: config.AppHandler{ - Prefix: "app", + Prefix: "app", + SecureViewApp: "Collabora Online", }, Archiver: config.Archiver{ Insecure: false,